From 8e881655c417079fc59b41378c132eedf17552e3 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 24 Oct 2024 16:48:30 +0100 Subject: [PATCH] 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 --- ....openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml | 2 -- ...usterrole_aws-ebs-csi-driver-operator-clusterrole.yaml | 2 -- ...ng_aws-ebs-csi-driver-operator-clusterrolebinding.yaml | 2 -- .../aws-ebs/hypershift/guest/kustomization.yaml | 6 ++++++ .../apps_v1_deployment_aws-ebs-csi-driver-operator.yaml | 2 -- .../aws-ebs/hypershift/mgmt/kustomization.yaml | 6 ++++++ ....openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml | 2 -- ...usterrole_aws-ebs-csi-driver-operator-clusterrole.yaml | 2 -- ...ng_aws-ebs-csi-driver-operator-clusterrolebinding.yaml | 2 -- .../aws-ebs/standalone/kustomization.yaml | 8 +++++++- ...enshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml | 2 -- ...errole_azure-disk-csi-driver-operator-clusterrole.yaml | 2 -- ...azure-disk-csi-driver-operator-clusterrolebinding.yaml | 2 -- .../azure-disk/hypershift/guest/kustomization.yaml | 6 ++++++ ...apps_v1_deployment_azure-disk-csi-driver-operator.yaml | 1 - .../azure-disk/hypershift/mgmt/kustomization.yaml | 6 ++++++ ...enshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml | 2 -- ...errole_azure-disk-csi-driver-operator-clusterrole.yaml | 2 -- ...azure-disk-csi-driver-operator-clusterrolebinding.yaml | 2 -- .../azure-disk/standalone/kustomization.yaml | 6 ++++++ ...enshift.io_v1_clustercsidriver_file.csi.azure.com.yaml | 2 -- ...errole_azure-file-csi-driver-operator-clusterrole.yaml | 2 -- ...azure-file-csi-driver-operator-clusterrolebinding.yaml | 2 -- .../azure-file/hypershift/guest/kustomization.yaml | 6 ++++++ ...apps_v1_deployment_azure-file-csi-driver-operator.yaml | 1 - .../azure-file/hypershift/mgmt/kustomization.yaml | 6 ++++++ ...enshift.io_v1_clustercsidriver_file.csi.azure.com.yaml | 2 -- ...errole_azure-file-csi-driver-operator-clusterrole.yaml | 2 -- ...azure-file-csi-driver-operator-clusterrolebinding.yaml | 2 -- .../azure-file/standalone/kustomization.yaml | 6 ++++++ 30 files changed, 55 insertions(+), 41 deletions(-) diff --git a/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml b/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml index 4a0925470..55820c823 100644 --- a/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml +++ b/assets/csidriveroperators/aws-ebs/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/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml b/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml index 36fb29e32..d0cd7e69d 100644 --- a/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml +++ b/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/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/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml b/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml index cdfe18f50..1f762af29 100644 --- a/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml +++ b/assets/csidriveroperators/aws-ebs/hypershift/guest/generated/rbac.authorization.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 index 3146a237f..4bbd0a6f2 100644 --- 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/assets/csidriveroperators/aws-ebs/hypershift/mgmt/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml b/assets/csidriveroperators/aws-ebs/hypershift/mgmt/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml index 9c4b95c90..788b24535 100644 --- a/assets/csidriveroperators/aws-ebs/hypershift/mgmt/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml +++ b/assets/csidriveroperators/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 index 352c6e163..47703c129 100644 --- 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/assets/csidriveroperators/aws-ebs/standalone/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml b/assets/csidriveroperators/aws-ebs/standalone/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml index 4a0925470..55820c823 100644 --- a/assets/csidriveroperators/aws-ebs/standalone/generated/operator.openshift.io_v1_clustercsidriver_ebs.csi.aws.com.yaml +++ b/assets/csidriveroperators/aws-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/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml b/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml index 36fb29e32..d0cd7e69d 100644 --- a/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_aws-ebs-csi-driver-operator-clusterrole.yaml +++ b/assets/csidriveroperators/aws-ebs/standalone/generated/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/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml b/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml index cdfe18f50..1f762af29 100644 --- a/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_aws-ebs-csi-driver-operator-clusterrolebinding.yaml +++ b/assets/csidriveroperators/aws-ebs/standalone/generated/rbac.authorization.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 index a5f6f3466..780a6d814 100644 --- 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/assets/csidriveroperators/azure-disk/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml b/assets/csidriveroperators/azure-disk/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml index 45032be8c..3c25d81b2 100644 --- a/assets/csidriveroperators/azure-disk/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml +++ b/assets/csidriveroperators/azure-disk/hypershift/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/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml b/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml index 147621920..7e81009d3 100644 --- a/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml +++ b/assets/csidriveroperators/azure-disk/hypershift/guest/generated/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/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml b/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml index 71a13b146..6c977fe56 100644 --- a/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml +++ b/assets/csidriveroperators/azure-disk/hypershift/guest/generated/rbac.authorization.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 index 3146a237f..4bbd0a6f2 100644 --- 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/assets/csidriveroperators/azure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml b/assets/csidriveroperators/azure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml index 3120af420..fbff8a687 100644 --- a/assets/csidriveroperators/azure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml +++ b/assets/csidriveroperators/azure-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 index 352c6e163..47703c129 100644 --- 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/assets/csidriveroperators/azure-disk/standalone/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml b/assets/csidriveroperators/azure-disk/standalone/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml index 45032be8c..3c25d81b2 100644 --- a/assets/csidriveroperators/azure-disk/standalone/generated/operator.openshift.io_v1_clustercsidriver_disk.csi.azure.com.yaml +++ b/assets/csidriveroperators/azure-disk/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/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml b/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml index 147621920..7e81009d3 100644 --- a/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-disk-csi-driver-operator-clusterrole.yaml +++ b/assets/csidriveroperators/azure-disk/standalone/generated/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/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml b/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml index 71a13b146..6c977fe56 100644 --- a/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-disk-csi-driver-operator-clusterrolebinding.yaml +++ b/assets/csidriveroperators/azure-disk/standalone/generated/rbac.authorization.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 index 6081c4a5f..780a6d814 100644 --- 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/assets/csidriveroperators/azure-file/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml b/assets/csidriveroperators/azure-file/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml index e00c5aca3..49991a866 100644 --- a/assets/csidriveroperators/azure-file/hypershift/guest/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml +++ b/assets/csidriveroperators/azure-file/hypershift/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/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml b/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml index 1c98acf1a..50115a5de 100644 --- a/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml +++ b/assets/csidriveroperators/azure-file/hypershift/guest/generated/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/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml b/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml index 85ff2c4c3..689baba9d 100644 --- a/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml +++ b/assets/csidriveroperators/azure-file/hypershift/guest/generated/rbac.authorization.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 index 3146a237f..4bbd0a6f2 100644 --- 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/assets/csidriveroperators/azure-file/hypershift/mgmt/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml b/assets/csidriveroperators/azure-file/hypershift/mgmt/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml index 1000c08f8..06d61570e 100644 --- a/assets/csidriveroperators/azure-file/hypershift/mgmt/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml +++ b/assets/csidriveroperators/azure-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 index 352c6e163..47703c129 100644 --- 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/assets/csidriveroperators/azure-file/standalone/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml b/assets/csidriveroperators/azure-file/standalone/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml index e00c5aca3..49991a866 100644 --- a/assets/csidriveroperators/azure-file/standalone/generated/operator.openshift.io_v1_clustercsidriver_file.csi.azure.com.yaml +++ b/assets/csidriveroperators/azure-file/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/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml b/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml index 1c98acf1a..50115a5de 100644 --- a/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.k8s.io_v1_clusterrole_azure-file-csi-driver-operator-clusterrole.yaml +++ b/assets/csidriveroperators/azure-file/standalone/generated/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/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml b/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml index 85ff2c4c3..689baba9d 100644 --- a/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.k8s.io_v1_clusterrolebinding_azure-file-csi-driver-operator-clusterrolebinding.yaml +++ b/assets/csidriveroperators/azure-file/standalone/generated/rbac.authorization.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 index 6081c4a5f..780a6d814 100644 --- 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"