assets: Remove pre-kustomize helper annotations

These provide no value once we have run kustomize and could be confusing. Remove them. Signed-off-by: Stephen Finucane <[email protected]>
openshift · Oct 30, 2024 · 8e88165 · 8e88165
1 parent 6390211
commit 8e88165
Show file tree

Hide file tree

Showing 30 changed files with 55 additions and 41 deletions.
diff --git a/...hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml b/...hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml
@@ -1,8 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: ebs.csi.aws.com
   namespace: openshift-cluster-csi-drivers
 spec:

diff --git a/...ted/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml b/...ted/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: aws-ebs-csi-driver-operator-clusterrole
 rules:
 - apiGroups:

diff --git a/...rization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml b/...rization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: aws-ebs-csi-driver-operator-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/csidriveroperators/aws-ebs/hypershift/guest/kustomization.yaml b/assets/csidriveroperators/aws-ebs/hypershift/guest/kustomization.yaml
@@ -17,3 +17,9 @@ patches:
         name: PLACEHOLDER
     target:
       annotationSelector: "storage.openshift.io/remove-from=guest"
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=mgmt"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...ors/aws-ebs/hypershift/mgmt/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml b/...ors/aws-ebs/hypershift/mgmt/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml
@@ -1,8 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: guest
   name: aws-ebs-csi-driver-operator
   namespace: ${CONTROLPLANE_NAMESPACE}
 spec:

diff --git a/assets/csidriveroperators/aws-ebs/hypershift/mgmt/kustomization.yaml b/assets/csidriveroperators/aws-ebs/hypershift/mgmt/kustomization.yaml
@@ -27,3 +27,9 @@ patches:
       kind: Kustomization
       metadata:
         name: PLACEHOLDER
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=guest"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...s-ebs/standalone/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml b/...s-ebs/standalone/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml
@@ -1,8 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: ebs.csi.aws.com
   namespace: openshift-cluster-csi-drivers
 spec:

diff --git a/...ted/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml b/...ted/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: aws-ebs-csi-driver-operator-clusterrole
 rules:
 - apiGroups:

diff --git a/...rization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml b/...rization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: aws-ebs-csi-driver-operator-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/csidriveroperators/aws-ebs/standalone/kustomization.yaml b/assets/csidriveroperators/aws-ebs/standalone/kustomization.yaml
@@ -5,8 +5,14 @@ patches:
   - path: monitoring_role.patch.yaml
     target:
       kind: Role
-      version: v1    
+      version: v1
   - path: deployment.patch.yaml
     target:
       kind: Deployment
       version: v1
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=mgmt"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...ershift/guest/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml b/...ershift/guest/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml
@@ -1,8 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: disk.csi.azure.com
   namespace: openshift-cluster-csi-drivers
 spec:

diff --git a/.../rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml b/.../rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-disk-csi-driver-operator-clusterrole
 rules:
 - apiGroups:

diff --git a/...ation.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml b/...ation.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-disk-csi-driver-operator-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/csidriveroperators/azure-disk/hypershift/guest/kustomization.yaml b/assets/csidriveroperators/azure-disk/hypershift/guest/kustomization.yaml
@@ -17,3 +17,9 @@ patches:
         name: PLACEHOLDER
     target:
       annotationSelector: "storage.openshift.io/remove-from=guest"
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=mgmt"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...ure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml b/...ure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   annotations:
     config.openshift.io/inject-proxy: azure-disk-csi-driver-operator
-    storage.openshift.io/remove-from: guest
   name: azure-disk-csi-driver-operator
   namespace: ${CONTROLPLANE_NAMESPACE}
 spec:

diff --git a/assets/csidriveroperators/azure-disk/hypershift/mgmt/kustomization.yaml b/assets/csidriveroperators/azure-disk/hypershift/mgmt/kustomization.yaml
@@ -27,3 +27,9 @@ patches:
       kind: Kustomization
       metadata:
         name: PLACEHOLDER
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=guest"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...sk/standalone/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml b/...sk/standalone/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml
@@ -1,8 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: disk.csi.azure.com
   namespace: openshift-cluster-csi-drivers
 spec:

diff --git a/.../rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml b/.../rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-disk-csi-driver-operator-clusterrole
 rules:
 - apiGroups:

diff --git a/...ation.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml b/...ation.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-disk-csi-driver-operator-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/csidriveroperators/azure-disk/standalone/kustomization.yaml b/assets/csidriveroperators/azure-disk/standalone/kustomization.yaml
@@ -10,3 +10,9 @@ patches:
     target:
       kind: Deployment
       version: v1
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=mgmt"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...ershift/guest/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml b/...ershift/guest/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml
@@ -1,8 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: file.csi.azure.com
   namespace: openshift-cluster-csi-drivers
 spec:

diff --git a/.../rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml b/.../rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-file-csi-driver-operator-clusterrole
 rules:
 - apiGroups:

diff --git a/...ation.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml b/...ation.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-file-csi-driver-operator-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/csidriveroperators/azure-file/hypershift/guest/kustomization.yaml b/assets/csidriveroperators/azure-file/hypershift/guest/kustomization.yaml
@@ -17,3 +17,9 @@ patches:
         name: PLACEHOLDER
     target:
       annotationSelector: "storage.openshift.io/remove-from=guest"
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=mgmt"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...ure-file/hypershift/mgmt/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml b/...ure-file/hypershift/mgmt/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   annotations:
     config.openshift.io/inject-proxy: azure-file-csi-driver-operator
-    storage.openshift.io/remove-from: guest
   name: azure-file-csi-driver-operator
   namespace: ${CONTROLPLANE_NAMESPACE}
 spec:

diff --git a/assets/csidriveroperators/azure-file/hypershift/mgmt/kustomization.yaml b/assets/csidriveroperators/azure-file/hypershift/mgmt/kustomization.yaml
@@ -27,3 +27,9 @@ patches:
       kind: Kustomization
       metadata:
         name: PLACEHOLDER
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=guest"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"
diff --git a/...le/standalone/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml b/...le/standalone/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml
@@ -1,8 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: file.csi.azure.com
   namespace: openshift-cluster-csi-drivers
 spec:

diff --git a/.../rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml b/.../rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-file-csi-driver-operator-clusterrole
 rules:
 - apiGroups:

diff --git a/...ation.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml b/...ation.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml
@@ -1,8 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  annotations:
-    storage.openshift.io/remove-from: mgmt
   name: azure-file-csi-driver-operator-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/csidriveroperators/azure-file/standalone/kustomization.yaml b/assets/csidriveroperators/azure-file/standalone/kustomization.yaml
@@ -10,3 +10,9 @@ patches:
     target:
       kind: Deployment
       version: v1
+  # remove these annotations as they're just noise post-kustomization
+  - target:
+      annotationSelector: "storage.openshift.io/remove-from=mgmt"
+    patch: |
+      - op: "remove"
+        path: "/metadata/annotations/storage.openshift.io~1remove-from"