Skip to content

Commit 6fed2a6

Browse files
Add ExternalRules to RoleTemplate (#1357)
Signed-off-by: raul <raul.cabello@suse.com> Co-authored-by: Matt Trachier <matt.trachier@suse.com>
1 parent 142dc21 commit 6fed2a6

9 files changed

Lines changed: 508 additions & 441 deletions

docs/data-sources/role_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ The following attributes are exported:
3131
* `default_role` - (Computed) Default role template for new created cluster or project (bool)
3232
* `description` - (Computed) Role template description (string)
3333
* `external` - (Computed) External role template (bool)
34+
* `external_rules` - (Computed) External rules used for authorization. (list)
3435
* `hidden` - (Computed) Hidden role template (bool)
3536
* `locked` - (Computed) Locked role template (bool)
3637
* `role_template_ids` - (Computed) Inherit role template IDs (list)

docs/resources/role_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ The following arguments are supported:
5050
* `default_role` - (Optional) Default role template for new created cluster or project. Default `false` (bool)
5151
* `description` - (Optional/Computed) Role template description (string)
5252
* `external` - (Optional) External role template. Default `false` (bool)
53+
* `external_rules` - (Optional/Computed) External rules used for authorization. This field is required when `external=true` and no underlying ClusterRole exists. (list)
5354
* `hidden` - (Optional) Hidden role template. Default `false` (bool)
5455
* `locked` - (Optional) Locked role template. Default `false` (bool)
5556
* `role_template_ids` - (Optional/Computed) Inherit role template IDs (list)

go.mod

Lines changed: 108 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,66 @@ require (
66
github.com/ghodss/yaml v1.0.0
77
github.com/hashicorp/go-version v1.6.0
88
github.com/hashicorp/terraform-plugin-sdk v1.17.2
9-
github.com/rancher/norman v0.0.0-20230426211126-d3552b018687
10-
github.com/rancher/rancher v0.0.0-20230512212658-eaa7b90049a4
9+
github.com/rancher/norman v0.0.0-20240207153035-cb54924f25c7
10+
github.com/rancher/rancher v0.0.0-20240618122546-56a742be417f
1111
github.com/rancher/rancher/pkg/apis v0.0.0
1212
github.com/rancher/rancher/pkg/client v0.0.0
13-
golang.org/x/crypto v0.6.0
14-
golang.org/x/sync v0.2.0
13+
golang.org/x/crypto v0.18.0
14+
golang.org/x/sync v0.5.0
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.25.4
17-
k8s.io/apimachinery v0.25.4
18-
k8s.io/apiserver v0.25.4
16+
k8s.io/api v0.27.4
17+
k8s.io/apimachinery v0.27.4
18+
k8s.io/apiserver v0.27.4
1919
k8s.io/client-go v12.0.0+incompatible
2020
)
2121

2222
require (
23-
cloud.google.com/go v0.107.0 // indirect
24-
cloud.google.com/go/compute v1.15.1 // indirect
23+
cloud.google.com/go v0.110.10 // indirect
24+
cloud.google.com/go/compute v1.23.3 // indirect
2525
cloud.google.com/go/compute/metadata v0.2.3 // indirect
26-
cloud.google.com/go/iam v0.10.0 // indirect
27-
cloud.google.com/go/storage v1.27.0 // indirect
26+
cloud.google.com/go/iam v1.1.5 // indirect
27+
cloud.google.com/go/storage v1.30.1 // indirect
2828
github.com/Masterminds/goutils v1.1.1 // indirect
29-
github.com/Masterminds/semver v1.5.0 // indirect
30-
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
29+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
30+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3131
github.com/agext/levenshtein v1.2.2 // indirect
3232
github.com/apparentlymart/go-cidr v1.1.0 // indirect
3333
github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
3434
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
3535
github.com/armon/go-radix v1.0.0 // indirect
36-
github.com/aws/aws-sdk-go v1.44.266 // indirect
36+
github.com/aws/aws-sdk-go v1.44.322 // indirect
3737
github.com/beorn7/perks v1.0.1 // indirect
3838
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
3939
github.com/bgentry/speakeasy v0.1.0 // indirect
4040
github.com/blang/semver v3.5.1+incompatible // indirect
41+
github.com/blang/semver/v4 v4.0.0 // indirect
4142
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4243
github.com/davecgh/go-spew v1.1.1 // indirect
43-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
44-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
45-
github.com/fatih/color v1.13.0 // indirect
46-
github.com/felixge/httpsnoop v1.0.1 // indirect
47-
github.com/fsnotify/fsnotify v1.5.4 // indirect
48-
github.com/go-logr/logr v1.2.4 // indirect
44+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
45+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
46+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
47+
github.com/fatih/color v1.15.0 // indirect
48+
github.com/felixge/httpsnoop v1.0.3 // indirect
49+
github.com/fsnotify/fsnotify v1.6.0 // indirect
50+
github.com/go-logr/logr v1.3.0 // indirect
4951
github.com/go-openapi/jsonpointer v0.19.6 // indirect
50-
github.com/go-openapi/jsonreference v0.20.1 // indirect
52+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5153
github.com/go-openapi/swag v0.22.3 // indirect
5254
github.com/gogo/protobuf v1.3.2 // indirect
5355
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5456
github.com/golang/protobuf v1.5.3 // indirect
55-
github.com/google/gnostic v0.5.7-v3refs // indirect
56-
github.com/google/go-cmp v0.5.9 // indirect
57+
github.com/google/gnostic v0.6.9 // indirect
58+
github.com/google/go-cmp v0.6.0 // indirect
5759
github.com/google/go-github/v29 v29.0.3 // indirect
5860
github.com/google/go-querystring v1.1.0 // indirect
5961
github.com/google/gofuzz v1.2.0 // indirect
60-
github.com/google/uuid v1.3.0 // indirect
61-
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
62-
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
62+
github.com/google/s2a-go v0.1.7 // indirect
63+
github.com/google/uuid v1.4.0 // indirect
64+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
65+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
6366
github.com/gorilla/handlers v1.5.1 // indirect
6467
github.com/gorilla/mux v1.8.0 // indirect
65-
github.com/gorilla/websocket v1.4.2 // indirect
68+
github.com/gorilla/websocket v1.5.0 // indirect
6669
github.com/hashicorp/errwrap v1.1.0 // indirect
6770
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
6871
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -81,18 +84,18 @@ require (
8184
github.com/hashicorp/terraform-plugin-test/v2 v2.2.1 // indirect
8285
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
8386
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
84-
github.com/huandu/xstrings v1.3.3 // indirect
85-
github.com/imdario/mergo v0.3.12 // indirect
87+
github.com/huandu/xstrings v1.4.0 // indirect
88+
github.com/imdario/mergo v0.3.15 // indirect
8689
github.com/jmespath/go-jmespath v0.4.0 // indirect
8790
github.com/josharian/intern v1.0.0 // indirect
8891
github.com/json-iterator/go v1.1.12 // indirect
89-
github.com/klauspost/compress v1.15.11 // indirect
92+
github.com/klauspost/compress v1.16.5 // indirect
9093
github.com/mailru/easyjson v0.7.7 // indirect
91-
github.com/matryer/moq v0.0.0-20200607124540-4638a53893e6 // indirect
92-
github.com/mattn/go-colorable v0.1.12 // indirect
93-
github.com/mattn/go-isatty v0.0.14 // indirect
94+
github.com/matryer/moq v0.3.2 // indirect
95+
github.com/mattn/go-colorable v0.1.13 // indirect
96+
github.com/mattn/go-isatty v0.0.19 // indirect
9497
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
95-
github.com/mitchellh/cli v1.1.2 // indirect
98+
github.com/mitchellh/cli v1.1.5 // indirect
9699
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
97100
github.com/mitchellh/copystructure v1.2.0 // indirect
98101
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -107,93 +110,99 @@ require (
107110
github.com/oklog/run v1.0.0 // indirect
108111
github.com/pkg/errors v0.9.1 // indirect
109112
github.com/posener/complete v1.2.3 // indirect
110-
github.com/prometheus/client_golang v1.14.0 // indirect
111-
github.com/prometheus/client_model v0.3.0 // indirect
112-
github.com/prometheus/common v0.37.0 // indirect
113-
github.com/prometheus/procfs v0.8.0 // indirect
114-
github.com/rancher/aks-operator v1.1.1-rc2 // indirect
115-
github.com/rancher/apiserver v0.0.0-20230120214941-e88c32739dc7 // indirect
116-
github.com/rancher/channelserver v0.5.1-0.20220405170618-28c9b37deff1 // indirect
117-
github.com/rancher/eks-operator v1.2.1 // indirect
118-
github.com/rancher/fleet/pkg/apis v0.0.0-20230420151154-ab055fa31e05 // indirect
119-
github.com/rancher/gke-operator v1.1.5 // indirect
120-
github.com/rancher/lasso v0.0.0-20230428185353-36908edf817b // indirect
121-
github.com/rancher/rke v1.4.6-rc3 // indirect
113+
github.com/prometheus/client_golang v1.16.0 // indirect
114+
github.com/prometheus/client_model v0.4.0 // indirect
115+
github.com/prometheus/common v0.44.0 // indirect
116+
github.com/prometheus/procfs v0.10.1 // indirect
117+
github.com/rancher/aks-operator v1.1.4 // indirect
118+
github.com/rancher/apiserver v0.0.0-20240207153521-4e102cf0d07b // indirect
119+
github.com/rancher/channelserver v0.5.1-0.20230719220800-0a37b73c7df8 // indirect
120+
github.com/rancher/eks-operator v1.2.3 // indirect
121+
github.com/rancher/fleet/pkg/apis v0.0.0-20230901075223-437edb7091f5 // indirect
122+
github.com/rancher/gke-operator v1.1.7 // indirect
123+
github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 // indirect
124+
github.com/rancher/rke v1.4.18 // indirect
122125
github.com/rancher/wrangler v1.1.1 // indirect
123-
github.com/sirupsen/logrus v1.9.2 // indirect
124-
github.com/spf13/afero v1.8.2 // indirect
126+
github.com/shopspring/decimal v1.3.1 // indirect
127+
github.com/sirupsen/logrus v1.9.3 // indirect
128+
github.com/spf13/afero v1.9.5 // indirect
129+
github.com/spf13/cast v1.5.1 // indirect
125130
github.com/spf13/pflag v1.0.5 // indirect
126-
github.com/ulikunitz/xz v0.5.10 // indirect
131+
github.com/ulikunitz/xz v0.5.11 // indirect
127132
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
128133
github.com/vmihailenco/tagparser v0.1.1 // indirect
129134
github.com/zclconf/go-cty v1.8.2 // indirect
130135
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
131136
go.opencensus.io v0.24.0 // indirect
132-
golang.org/x/mod v0.10.0 // indirect
133-
golang.org/x/net v0.10.0 // indirect
134-
golang.org/x/oauth2 v0.4.0 // indirect
135-
golang.org/x/sys v0.8.0 // indirect
136-
golang.org/x/term v0.8.0 // indirect
137-
golang.org/x/text v0.9.0 // indirect
138-
golang.org/x/time v0.3.0 // indirect
139-
golang.org/x/tools v0.9.1 // indirect
137+
golang.org/x/mod v0.14.0 // indirect
138+
golang.org/x/net v0.20.0 // indirect
139+
golang.org/x/oauth2 v0.16.0 // indirect
140+
golang.org/x/sys v0.16.0 // indirect
141+
golang.org/x/term v0.16.0 // indirect
142+
golang.org/x/text v0.14.0 // indirect
143+
golang.org/x/time v0.5.0 // indirect
144+
golang.org/x/tools v0.16.1 // indirect
140145
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
141-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
142-
google.golang.org/api v0.103.0 // indirect
146+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
147+
google.golang.org/api v0.153.0 // indirect
143148
google.golang.org/appengine v1.6.7 // indirect
144-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
145-
google.golang.org/grpc v1.53.0 // indirect
146-
google.golang.org/protobuf v1.28.1 // indirect
149+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
150+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
151+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
152+
google.golang.org/grpc v1.59.0 // indirect
153+
google.golang.org/protobuf v1.31.0 // indirect
147154
gopkg.in/inf.v0 v0.9.1 // indirect
148155
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
k8s.io/apiextensions-apiserver v0.25.4 // indirect
150-
k8s.io/component-base v0.25.4 // indirect
151-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
152-
k8s.io/klog/v2 v2.90.1 // indirect
153-
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
154-
k8s.io/kubernetes v1.25.4 // indirect
155-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
156+
k8s.io/apiextensions-apiserver v0.27.4 // indirect
157+
k8s.io/component-base v0.27.4 // indirect
158+
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
159+
k8s.io/klog/v2 v2.100.1 // indirect
160+
k8s.io/kube-openapi v0.0.0-20230530175149-33f04d5d6b58 // indirect
161+
k8s.io/kubernetes v1.27.4 // indirect
162+
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
156163
sigs.k8s.io/cli-utils v0.27.0 // indirect
157-
sigs.k8s.io/cluster-api v1.2.12 // indirect
158-
sigs.k8s.io/controller-runtime v0.12.3 // indirect
164+
sigs.k8s.io/cluster-api v1.5.0 // indirect
165+
sigs.k8s.io/controller-runtime v0.15.1 // indirect
159166
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
160167
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
161-
sigs.k8s.io/yaml v1.3.0 // indirect
168+
sigs.k8s.io/yaml v1.4.0 // indirect
162169
)
163170

164171
replace (
165172
github.com/crewjam/saml => github.com/crewjam/saml v0.4.5
166173
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
167174
github.com/docker/docker => github.com/docker/docker v20.10.17+incompatible
168-
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20230512212658-eaa7b90049a4
169-
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20230512212658-eaa7b90049a4
175+
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20240618122546-56a742be417f
176+
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20240618122546-56a742be417f
177+
github.com/rancher/wrangler v1.1.1 => github.com/rancher/wrangler v1.1.1-0.20240307150840-1279389d86ec
170178
github.com/spf13/afero => github.com/spf13/afero v1.2.2
179+
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.31.0
171180
helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.9.0-rancher1
172-
k8s.io/api => k8s.io/api v0.25.4
173-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.4
174-
k8s.io/apimachinery => k8s.io/apimachinery v0.25.4
175-
k8s.io/apiserver => k8s.io/apiserver v0.25.4
176-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.4
177-
k8s.io/client-go => github.com/rancher/client-go v1.25.4-rancher1
178-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.4
179-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.4
180-
k8s.io/code-generator => k8s.io/code-generator v0.25.4
181-
k8s.io/component-base => k8s.io/component-base v0.25.4
182-
k8s.io/component-helpers => k8s.io/component-helpers v0.25.4
183-
k8s.io/controller-manager => k8s.io/controller-manager v0.25.4
184-
k8s.io/cri-api => k8s.io/cri-api v0.25.4
185-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.4
186-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.4
187-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.4
188-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.4
189-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.4
190-
k8s.io/kubectl => k8s.io/kubectl v0.25.4
191-
k8s.io/kubelet => k8s.io/kubelet v0.25.4
181+
k8s.io/api => k8s.io/api v0.27.4
182+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.4
183+
k8s.io/apimachinery => k8s.io/apimachinery v0.27.4
184+
k8s.io/apiserver => k8s.io/apiserver v0.27.4
185+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.4
186+
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
187+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.4
188+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.4
189+
k8s.io/code-generator => k8s.io/code-generator v0.27.4
190+
k8s.io/component-base => k8s.io/component-base v0.27.4
191+
k8s.io/component-helpers => k8s.io/component-helpers v0.27.4
192+
k8s.io/controller-manager => k8s.io/controller-manager v0.27.4
193+
k8s.io/cri-api => k8s.io/cri-api v0.27.4
194+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.4
195+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.4
196+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.4
197+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.4
198+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.4
199+
k8s.io/kubectl => k8s.io/kubectl v0.27.4
200+
k8s.io/kubelet => k8s.io/kubelet v0.27.4
192201
k8s.io/kubernetes => k8s.io/kubernetes v1.25.4
193-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.4
194-
k8s.io/metrics => k8s.io/metrics v0.25.4
195-
k8s.io/mount-utils => k8s.io/mount-utils v0.25.4
196-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.4
197-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.4
202+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.4
203+
k8s.io/metrics => k8s.io/metrics v0.27.4
204+
k8s.io/mount-utils => k8s.io/mount-utils v0.27.4
205+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.4
206+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.4
198207
launchpad.net/gocheck => github.com/go-check/check v0.0.0-20200227125254-8fa46927fb4f
199208
)

0 commit comments

Comments
 (0)