Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/proto/teleport/legacy/types/types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3520,7 +3520,7 @@ message RoleV6 {
// SubKind is an optional resource sub kind, used in some resources
string SubKind = 2 [(gogoproto.jsontag) = "sub_kind,omitempty"];
// Version is the resource version. It must be specified.
// Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`.
// Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`, `v8`.
string Version = 3 [(gogoproto.jsontag) = "version"];
// Metadata is resource metadata
Metadata Metadata = 4 [
Expand Down
2 changes: 1 addition & 1 deletion api/types/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Teleport Terraform provider.

### Required

- `version` (String) Version is the resource version. It must be specified. Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`.
- `version` (String) Version is the resource version. It must be specified. Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`, `v8`.

### Optional

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This page describes the supported values of the teleport_role resource of the Te
# Teleport Role resource

resource "teleport_role" "example" {
version = "v7"
version = "v8"
metadata = {
name = "example"
description = "Example Teleport Role"
Expand Down Expand Up @@ -81,7 +81,7 @@ resource "teleport_role" "example" {

### Required

- `version` (String) Version is the resource version. It must be specified. Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`.
- `version` (String) Version is the resource version. It must be specified. Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`, `v8`.

### Optional

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Teleport Role resource

resource "teleport_role" "example" {
version = "v7"
version = "v8"
metadata = {
name = "example"
description = "Example Teleport Role"
Expand Down
2 changes: 1 addition & 1 deletion integrations/terraform/protoc-gen-terraform-teleport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ validators:
ProvisionTokenV2.Version:
- UseVersionBetween(2,2)
RoleV6.Version:
- UseVersionBetween(3,7)
- UseVersionBetween(3,8)
SAMLConnectorV2.Version:
- UseVersionBetween(2,2)
SAMLConnectorV2.Spec:
Expand Down
3 changes: 2 additions & 1 deletion integrations/terraform/reference.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ To mitigate this, you should explicitly set the resource version.
- v12 default role version is `v5`
- v13 default role version is `v6`
- v14 default role version is `v7`
- v18+ default role version is `v8`

For example, before upgrading from v12 to v13, edit every unversioned role
to pin the `v5` version:
Expand Down Expand Up @@ -1649,7 +1650,7 @@ resource "teleport_provision_token" "iam-token" {
| metadata | object | | Metadata is resource metadata |
| spec | object | | Spec is a role specification |
| sub_kind | string | | SubKind is an optional resource sub kind, used in some resources |
| version | string | * | Version is the resource version. It must be specified. Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`. |
| version | string | * | Version is the resource version. It must be specified. Supported values are: `v3`, `v4`, `v5`, `v6`, `v7`, `v8`. |

### metadata

Expand Down
2 changes: 1 addition & 1 deletion integrations/terraform/testlib/fixtures/role_0_create.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "teleport_role" "test" {
version = "v7"
version = "v8"
metadata = {
name = "test"
}
Expand Down
2 changes: 1 addition & 1 deletion integrations/terraform/testlib/fixtures/role_1_update.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "teleport_role" "test" {
version = "v7"
version = "v8"
metadata = {
name = "test"
description = ""
Expand Down
2 changes: 1 addition & 1 deletion integrations/terraform/testlib/fixtures/role_2_update.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "teleport_role" "test" {
version = "v7"
version = "v8"
metadata = {
name = "test"
description = "Test role"
Expand Down
2 changes: 1 addition & 1 deletion integrations/terraform/testlib/fixtures/role_3_update.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "teleport_role" "test" {
version = "v7"
version = "v8"
metadata = {
name = "test"
expires = "2032-12-12T00:00:00Z"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
data "teleport_role" "test" {
kind = "role"
version = "v7"
version = "v8"
metadata = {
name = "test"
}
Expand Down
2 changes: 1 addition & 1 deletion integrations/terraform/testlib/fixtures/role_drift_0.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "teleport_role" "splitbrain" {
version = "v7"
version = "v8"
metadata = {
name = "splitbrain"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ resource "teleport_role" "test_decrease_reviewers" {
}
}

version = "v6"
version = "v8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ resource "teleport_role" "test_decrease_reviewers" {
}
}

version = "v6"
version = "v8"
}
17 changes: 17 additions & 0 deletions integrations/terraform/testlib/fixtures/role_upgrade_v8.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
resource "teleport_role" "upgrade" {
metadata = {
name = "upgrade"
}

spec = {
allow = {
logins = ["onev8"]
kubernetes_labels = {
env = ["dev", "prod"]
}
}
}

version = "v8"
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "teleport_role" "upgrade" {
resource "teleport_role" "kube_resources_v6" {
metadata = {
name = "upgrade"
name = "kube_resources_v6"
}

spec = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

resource "teleport_role" "kube_resources_v7" {
metadata = {
name = "kube_resources_v7"
}

spec = {
allow = {
logins = ["onev7"]

kubernetes_labels = {
env = ["dev", "prod"]
}

kubernetes_resources = [
{
kind = "deployment"
name = "*"
namespace = "myns"
verbs = ["get"]
}
]
}
}

version = "v7"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

resource "teleport_role" "kube_resources_v8" {
metadata = {
name = "kube_resources_v8"
}

spec = {
allow = {
logins = ["onev8"]

kubernetes_labels = {
env = ["dev", "prod"]
}

kubernetes_resources = [
{
kind = "pods"
name = "*"
namespace = "myns"
verbs = ["get"]
},
{
kind = "deployments"
api_group = "apps"
name = "*"
namespace = "myns"
verbs = ["get"]
}
]
}
}

version = "v8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ resource "teleport_role" "kube_verbs" {

spec = {
allow = {
logins = ["onev6"]
logins = ["onev8"]
kubernetes_resources = [
{
kind = "pod"
kind = "pods"
name = "*"
namespace = "myns"
verbs = ["get", "watch", "list"]
Expand All @@ -17,5 +17,5 @@ resource "teleport_role" "kube_verbs" {
}
}

version = "v7"
version = "v8"
}
Loading
Loading