Change AzureMachinePool experiment API group to infrastructure.x-k8s.io

kubernetes-sigs · May 27, 2021 · 977e141 · 977e141
1 parent b05ad4e
commit 977e141
Show file tree

Hide file tree

Showing 48 changed files with 556 additions and 190 deletions.
diff --git a/Tiltfile b/Tiltfile
@@ -52,7 +52,6 @@ def deploy_capi():
             if core_extra_args:
                 for namespace in ["capi-system", "capi-webhook-system"]:
                     patch_args_with_extra_args(namespace, "capi-controller-manager", core_extra_args)
-                patch_capi_manager_role_with_exp_infra_rbac()
         if extra_args.get("kubeadm-bootstrap"):
             kb_extra_args = extra_args.get("kubeadm-bootstrap")
             if kb_extra_args:
@@ -73,21 +72,6 @@ def patch_args_with_extra_args(namespace, name, extra_args):
         local("kubectl patch deployment {} -n {} --type json -p='{}'".format(name, namespace, str(encode_json(patch)).replace("\n", "")))
 
 
-# patch the CAPI manager role to also provide access to experimental infrastructure
-def patch_capi_manager_role_with_exp_infra_rbac():
-    api_groups_str = str(local('kubectl get clusterrole capi-manager-role -o jsonpath={.rules[1].apiGroups}'))
-    exp_infra_group = "exp.infrastructure.cluster.x-k8s.io"
-    if exp_infra_group not in api_groups_str:
-        groups = api_groups_str[1:-1].split() # "[arg1 arg2 ...]" trim off the first and last, then split
-        groups.append(exp_infra_group)
-        patch = [{
-            "op": "replace",
-            "path": "/rules/1/apiGroups",
-            "value": groups,
-        }]
-        local("kubectl patch clusterrole capi-manager-role --type json -p='{}'".format(str(encode_json(patch)).replace("\n", "")))
-
-
 # Users may define their own Tilt customizations in tilt.d. This directory is excluded from git and these files will
 # not be checked in to version control.
 def include_user_tilt_files():

diff --git a/...e.cluster.x-k8s.io_azuremachinepools.yaml → ...e.cluster.x-k8s.io_azuremachinepools.yaml b/...e.cluster.x-k8s.io_azuremachinepools.yaml → ...e.cluster.x-k8s.io_azuremachinepools.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
-  name: azuremachinepools.exp.infrastructure.cluster.x-k8s.io
+  name: azuremachinepools.infrastructure.cluster.x-k8s.io
 spec:
-  group: exp.infrastructure.cluster.x-k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     categories:
     - cluster-api

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml
diff --git a/...luster.x-k8s.io_azuremanagedclusters.yaml → ...luster.x-k8s.io_azuremanagedclusters.yaml b/...luster.x-k8s.io_azuremanagedclusters.yaml → ...luster.x-k8s.io_azuremanagedclusters.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
-  name: azuremanagedclusters.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedclusters.infrastructure.cluster.x-k8s.io
 spec:
-  group: exp.infrastructure.cluster.x-k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     categories:
     - cluster-api

diff --git a/...r.x-k8s.io_azuremanagedcontrolplanes.yaml → ...r.x-k8s.io_azuremanagedcontrolplanes.yaml b/...r.x-k8s.io_azuremanagedcontrolplanes.yaml → ...r.x-k8s.io_azuremanagedcontrolplanes.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
-  name: azuremanagedcontrolplanes.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io
 spec:
-  group: exp.infrastructure.cluster.x-k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     categories:
     - cluster-api

diff --git a/...er.x-k8s.io_azuremanagedmachinepools.yaml → ...er.x-k8s.io_azuremanagedmachinepools.yaml b/...er.x-k8s.io_azuremanagedmachinepools.yaml → ...er.x-k8s.io_azuremanagedmachinepools.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
-  name: azuremanagedmachinepools.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedmachinepools.infrastructure.cluster.x-k8s.io
 spec:
-  group: exp.infrastructure.cluster.x-k8s.io
+  group: infrastructure.cluster.x-k8s.io
   names:
     categories:
     - cluster-api

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -9,10 +9,10 @@ resources:
   - bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
   - bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml
   - bases/infrastructure.cluster.x-k8s.io_azureclusteridentities.yaml
-  - bases/exp.infrastructure.cluster.x-k8s.io_azuremachinepools.yaml
-  - bases/exp.infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml
-  - bases/exp.infrastructure.cluster.x-k8s.io_azuremanagedclusters.yaml
-  - bases/exp.infrastructure.cluster.x-k8s.io_azuremanagedcontrolplanes.yaml
+  - bases/infrastructure.cluster.x-k8s.io_azuremachinepools.yaml
+  - bases/infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml
+  - bases/infrastructure.cluster.x-k8s.io_azuremanagedclusters.yaml
+  - bases/infrastructure.cluster.x-k8s.io_azuremanagedcontrolplanes.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 

diff --git a/config/crd/patches/cainjection_in_azuremachinepools.yaml b/config/crd/patches/cainjection_in_azuremachinepools.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: azuremachinepools.exp.infrastructure.cluster.x-k8s.io
+  name: azuremachinepools.infrastructure.cluster.x-k8s.io
diff --git a/config/crd/patches/cainjection_in_azuremanagedclusters.yaml b/config/crd/patches/cainjection_in_azuremanagedclusters.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: azuremanagedclusters.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedclusters.infrastructure.cluster.x-k8s.io
diff --git a/config/crd/patches/cainjection_in_azuremanagedcontrolplanes.yaml b/config/crd/patches/cainjection_in_azuremanagedcontrolplanes.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: azuremanagedcontrolplanes.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io
diff --git a/config/crd/patches/cainjection_in_azuremanagedmachinepools.yaml b/config/crd/patches/cainjection_in_azuremanagedmachinepools.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: azuremanagedmachinepools.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedmachinepools.infrastructure.cluster.x-k8s.io
diff --git a/config/crd/patches/webhook_in_azuremachinepools.yaml b/config/crd/patches/webhook_in_azuremachinepools.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: azuremachinepools.exp.infrastructure.cluster.x-k8s.io
+  name: azuremachinepools.infrastructure.cluster.x-k8s.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/crd/patches/webhook_in_azuremanagedclusters.yaml b/config/crd/patches/webhook_in_azuremanagedclusters.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: azuremanagedclusters.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedclusters.infrastructure.cluster.x-k8s.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/crd/patches/webhook_in_azuremanagedcontrolplanes.yaml b/config/crd/patches/webhook_in_azuremanagedcontrolplanes.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: azuremanagedcontrolplanes.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/crd/patches/webhook_in_azuremanagedmachinepools.yaml b/config/crd/patches/webhook_in_azuremanagedmachinepools.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: azuremanagedmachinepools.exp.infrastructure.cluster.x-k8s.io
+  name: azuremanagedmachinepools.infrastructure.cluster.x-k8s.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -60,33 +60,34 @@ rules:
 - apiGroups:
   - cluster.x-k8s.io
   resources:
-  - machines
-  - machines/status
+  - machinepools
+  - machinepools/status
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - ""
+  - cluster.x-k8s.io
   resources:
-  - nodes
+  - machines
+  - machines/status
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - exp.cluster.x-k8s.io
+  - ""
   resources:
-  - machinepools
-  - machinepools/status
+  - nodes
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremachinepools
+  - azureclusteridentities
+  - azureclusteridentities/status
   verbs:
   - create
   - delete
@@ -96,17 +97,9 @@ rules:
   - update
   - watch
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
-  resources:
-  - azuremachinepools/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremanagedclusters
+  - azureclusters
   verbs:
   - create
   - delete
@@ -116,17 +109,17 @@ rules:
   - update
   - watch
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremanagedclusters/status
+  - azureclusters/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremanagedcontrolplanes
+  - azuremachinepools
   verbs:
   - create
   - delete
@@ -136,17 +129,17 @@ rules:
   - update
   - watch
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremanagedcontrolplanes/status
+  - azuremachinepools/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremanagedmachinepools
+  - azuremachines
   verbs:
   - create
   - delete
@@ -156,30 +149,26 @@ rules:
   - update
   - watch
 - apiGroups:
-  - exp.infrastructure.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremanagedmachinepools/status
+  - azuremachines/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - azureclusteridentities
-  - azureclusteridentities/status
+  - azuremachinetemplates
+  - azuremachinetemplates/status
   verbs:
-  - create
-  - delete
   - get
   - list
-  - patch
-  - update
   - watch
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - azureclusters
+  - azuremanagedclusters
   verbs:
   - create
   - delete
@@ -191,15 +180,15 @@ rules:
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - azureclusters/status
+  - azuremanagedclusters/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremachines
+  - azuremanagedcontrolplanes
   verbs:
   - create
   - delete
@@ -211,17 +200,28 @@ rules:
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremachines/status
+  - azuremanagedcontrolplanes/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - azuremachinetemplates
-  - azuremachinetemplates/status
+  - azuremanagedmachinepools
   verbs:
+  - create
+  - delete
   - get
   - list
+  - patch
+  - update
   - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - azuremanagedmachinepools/status
+  verbs:
+  - get
+  - patch
+  - update