Skip to content

Commit e7f4fa8

Browse files
author
Peter Matseykanets
authored
Add inherited_cluster_roles attribute to global_role (#1242)
1 parent 5d96504 commit e7f4fa8

10 files changed

+191
-105
lines changed

docs/data-sources/global_role.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ The following attributes are exported:
3131
* `rules` - (Computed) Global role policy rules (list)
3232
* `annotations` - (Computed) Annotations for global role object (map)
3333
* `labels` - (Computed) Labels for global role object (map)
34+
* `inherited_cluster_roles` - (Optional) Names of role templates whose permissions are granted by this global role in every cluster besides the local cluster (list)

docs/resources/role_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ The following arguments are supported:
5656
* `rules` - (Optional/Computed) Role template policy rules (list)
5757
* `annotations` - (Optional/Computed) Annotations for role template object (map)
5858
* `labels` - (Optional/Computed) Labels for role template object (map)
59+
* `inherited_cluster_roles` - (Optional) Names of role templates whose permissions are granted by this global role in every cluster besides the local cluster (list)
5960

6061
## Attributes Reference
6162

go.mod

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,29 @@ require (
1212
github.com/rancher/rancher/pkg/client v0.0.0
1313
github.com/rancher/tfp-automation v0.0.0-20230809214753-73e576db407e
1414
github.com/stretchr/testify v1.8.4
15-
golang.org/x/crypto v0.6.0
16-
golang.org/x/sync v0.2.0
15+
golang.org/x/crypto v0.12.0
16+
golang.org/x/sync v0.3.0
1717
gopkg.in/yaml.v2 v2.4.0
18-
k8s.io/api v0.25.4
19-
k8s.io/apimachinery v0.25.4
18+
k8s.io/api v0.25.12
19+
k8s.io/apimachinery v0.25.12
2020
k8s.io/apiserver v0.25.4
2121
k8s.io/client-go v12.0.0+incompatible
2222
)
2323

2424
require (
25-
cloud.google.com/go v0.107.0 // indirect
26-
cloud.google.com/go/compute v1.15.1 // indirect
25+
cloud.google.com/go v0.110.2 // indirect
26+
cloud.google.com/go/compute v1.20.1 // indirect
2727
cloud.google.com/go/compute/metadata v0.2.3 // indirect
28-
cloud.google.com/go/iam v0.10.0 // indirect
29-
cloud.google.com/go/storage v1.27.0 // indirect
28+
cloud.google.com/go/iam v0.13.0 // indirect
29+
cloud.google.com/go/storage v1.29.0 // indirect
3030
github.com/Masterminds/goutils v1.1.1 // indirect
3131
github.com/Masterminds/semver v1.5.0 // indirect
3232
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
3333
github.com/agext/levenshtein v1.2.3 // indirect
3434
github.com/apparentlymart/go-cidr v1.1.0 // indirect
3535
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
3636
github.com/armon/go-radix v1.0.0 // indirect
37-
github.com/aws/aws-sdk-go v1.44.266 // indirect
37+
github.com/aws/aws-sdk-go v1.44.300 // indirect
3838
github.com/beorn7/perks v1.0.1 // indirect
3939
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
4040
github.com/bgentry/speakeasy v0.1.0 // indirect
@@ -59,9 +59,10 @@ require (
5959
github.com/google/go-github/v29 v29.0.3 // indirect
6060
github.com/google/go-querystring v1.1.0 // indirect
6161
github.com/google/gofuzz v1.2.0 // indirect
62+
github.com/google/s2a-go v0.1.4 // indirect
6263
github.com/google/uuid v1.3.0 // indirect
63-
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
64-
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
64+
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
65+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
6566
github.com/gorilla/handlers v1.5.1 // indirect
6667
github.com/gorilla/mux v1.8.0 // indirect
6768
github.com/gorilla/websocket v1.4.2 // indirect
@@ -120,17 +121,17 @@ require (
120121
github.com/prometheus/client_model v0.3.0 // indirect
121122
github.com/prometheus/common v0.37.0 // indirect
122123
github.com/prometheus/procfs v0.8.0 // indirect
123-
github.com/rancher/aks-operator v1.1.1-rc2 // indirect
124+
github.com/rancher/aks-operator v1.2.0-rc2 // indirect
124125
github.com/rancher/apiserver v0.0.0-20230120214941-e88c32739dc7 // indirect
125126
github.com/rancher/channelserver v0.5.1-0.20220405170618-28c9b37deff1 // indirect
126-
github.com/rancher/eks-operator v1.2.1 // indirect
127-
github.com/rancher/fleet/pkg/apis v0.0.0-20230516111835-f52a0e7d38af // indirect
128-
github.com/rancher/gke-operator v1.1.5 // indirect
129-
github.com/rancher/lasso v0.0.0-20230428185353-36908edf817b // indirect
130-
github.com/rancher/rke v1.4.6-rc3 // indirect
127+
github.com/rancher/eks-operator v1.2.2-rc3 // indirect
128+
github.com/rancher/fleet/pkg/apis v0.0.0-20230810121238-9d0ee7f56848 // indirect
129+
github.com/rancher/gke-operator v1.1.6-rc2 // indirect
130+
github.com/rancher/lasso v0.0.0-20230629200414-8a54b32e6792 // indirect
131+
github.com/rancher/rke v1.5.0-rc2 // indirect
131132
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007 // indirect
132133
github.com/rancher/wrangler v1.1.1 // indirect
133-
github.com/sirupsen/logrus v1.9.2 // indirect
134+
github.com/sirupsen/logrus v1.9.3 // indirect
134135
github.com/spf13/afero v1.8.2 // indirect
135136
github.com/spf13/pflag v1.0.5 // indirect
136137
github.com/tmccombs/hcl2json v0.3.3 // indirect
@@ -141,20 +142,22 @@ require (
141142
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
142143
go.opencensus.io v0.24.0 // indirect
143144
golang.org/x/mod v0.10.0 // indirect
144-
golang.org/x/net v0.10.0 // indirect
145-
golang.org/x/oauth2 v0.4.0 // indirect
146-
golang.org/x/sys v0.8.0 // indirect
147-
golang.org/x/term v0.8.0 // indirect
148-
golang.org/x/text v0.9.0 // indirect
145+
golang.org/x/net v0.14.0 // indirect
146+
golang.org/x/oauth2 v0.10.0 // indirect
147+
golang.org/x/sys v0.11.0 // indirect
148+
golang.org/x/term v0.11.0 // indirect
149+
golang.org/x/text v0.12.0 // indirect
149150
golang.org/x/time v0.3.0 // indirect
150-
golang.org/x/tools v0.9.1 // indirect
151+
golang.org/x/tools v0.9.3 // indirect
151152
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
152153
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
153-
google.golang.org/api v0.103.0 // indirect
154+
google.golang.org/api v0.130.0 // indirect
154155
google.golang.org/appengine v1.6.7 // indirect
155-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
156-
google.golang.org/grpc v1.53.0 // indirect
157-
google.golang.org/protobuf v1.28.1 // indirect
156+
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
157+
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
158+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 // indirect
159+
google.golang.org/grpc v1.56.1 // indirect
160+
google.golang.org/protobuf v1.31.0 // indirect
158161
gopkg.in/inf.v0 v0.9.1 // indirect
159162
gopkg.in/yaml.v3 v3.0.1 // indirect
160163
k8s.io/apiextensions-apiserver v0.25.4 // indirect
@@ -177,8 +180,8 @@ replace (
177180
github.com/crewjam/saml => github.com/crewjam/saml v0.4.5
178181
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
179182
github.com/docker/docker => github.com/docker/docker v20.10.17+incompatible
180-
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20230512212658-eaa7b90049a4
181-
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20230512212658-eaa7b90049a4
183+
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20230901132600-5e1ee2611616
184+
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20230901132600-5e1ee2611616
182185
github.com/spf13/afero => github.com/spf13/afero v1.2.2
183186
helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.9.0-rancher1
184187
k8s.io/api => k8s.io/api v0.25.4

0 commit comments

Comments
 (0)