Skip to content

Commit 92bc0c3

Browse files
committed
feat: support IAMRoleSelector
1 parent e559791 commit 92bc0c3

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

templates/config/controller/deployment.yaml.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ spec:
4343
- "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)"
4444
- --feature-gates
4545
- "$(FEATURE_GATES)"
46+
- --enable-carm=$(ENABLE_CARM)
4647
image: controller:latest
4748
name: controller
4849
ports:
@@ -80,6 +81,8 @@ spec:
8081
value: "1"
8182
- name: "FEATURE_GATES"
8283
value: ""
84+
- name: "ENABLE_CARM"
85+
value: "true"
8386
securityContext:
8487
allowPrivilegeEscalation: false
8588
privileged: false

templates/helm/values.yaml.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,6 @@ featureGates:
183183
# Enable ReadOnlyResources feature/annotation.
184184
ReadOnlyResources: true
185185
# Enable ResourceAdoption feature/annotation.
186-
ResourceAdoption: true
186+
ResourceAdoption: true
187+
# Enable IAMRoleSelector, a multirole feature, replacing CARM. See https://github.com/aws-controllers-k8s/community/pull/2628
188+
IAMRoleSelector: false

templates/pkg/resource/registry.go.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
88
)
99

10-
// +kubebuilder:rbac:groups=services.k8s.aws,resources=adoptedresources,verbs=get;list;watch;create;update;patch;delete
11-
// +kubebuilder:rbac:groups=services.k8s.aws,resources=adoptedresources/status,verbs=get;update;patch
10+
// +kubebuilder:rbac:groups=services.k8s.aws,resources=iamroleselectors,verbs=get;list;watch;create;update;patch;delete
11+
// +kubebuilder:rbac:groups=services.k8s.aws,resources=iamroleselectors/status,verbs=get;update;patch
1212
// +kubebuilder:rbac:groups=services.k8s.aws,resources=fieldexports,verbs=get;list;watch;create;update;patch;delete
1313
// +kubebuilder:rbac:groups=services.k8s.aws,resources=fieldexports/status,verbs=get;update;patch
1414
// +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch

0 commit comments

Comments
 (0)