diff --git a/cluster-scope/overlays/nerc-ocp-infra/configmaps/admin-acks.yaml b/cluster-scope/base/core/configmaps/admin-acks/configmap.yaml similarity index 61% rename from cluster-scope/overlays/nerc-ocp-infra/configmaps/admin-acks.yaml rename to cluster-scope/base/core/configmaps/admin-acks/configmap.yaml index 703c5326..82b7cc08 100644 --- a/cluster-scope/overlays/nerc-ocp-infra/configmaps/admin-acks.yaml +++ b/cluster-scope/base/core/configmaps/admin-acks/configmap.yaml @@ -1,14 +1,11 @@ apiVersion: v1 kind: ConfigMap -data: - ack-4.11-kube-1.25-api-removals-in-4.12: "true" - ack-4.12-kube-1.26-api-removals-in-4.13: "true" metadata: annotations: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - kubernetes.io/description: Record administrator acknowledgments of update gates - defined in the admin-gates ConfigMap in the openshift-config-managed namespace. + kubernetes.io/description: Record administrator acknowledgments of update gates defined in the admin-gates ConfigMap in the openshift-config-managed namespace. release.openshift.io/create-only: "true" name: admin-acks namespace: openshift-config +data: {} diff --git a/cluster-scope/base/core/configmaps/admin-acks/kustomization.yaml b/cluster-scope/base/core/configmaps/admin-acks/kustomization.yaml new file mode 100644 index 00000000..58e32056 --- /dev/null +++ b/cluster-scope/base/core/configmaps/admin-acks/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - configmap.yaml diff --git a/cluster-scope/overlays/common/kustomization.yaml b/cluster-scope/overlays/common/kustomization.yaml index 5f882cb7..d28b1b44 100644 --- a/cluster-scope/overlays/common/kustomization.yaml +++ b/cluster-scope/overlays/common/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization resources: - ../../base/openapi +- ../../base/core/configmaps/admin-acks/ - ../../base/machineconfiguration.openshift.io/kubeletconfigs/system-reserved - ../../base/config.openshift.io/oauths/cluster - ../../base/rbac.authorization.k8s.io/clusterroles/node-labeler/ diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml index 9021f534..0c0b3063 100644 --- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml @@ -18,7 +18,6 @@ resources: - ../../base/core/namespaces/nerc-ocp-prod - ../../base/operators.coreos.com/subscriptions/openshift-pipelines-operator - ../../base/operators.coreos.com/subscriptions/loki-operator -- configmaps/admin-acks.yaml - clusterversion.yaml - machineconfigs/disable-net-ifnames.yaml - machineconfigs/refresh-storage-interface.yaml @@ -38,6 +37,12 @@ generatorOptions: disableNameSuffixHash: true configMapGenerator: +- name: admin-acks + namespace: openshift-config + behavior: merge + literals: + - ack-4.11-kube-1.25-api-removals-in-4.12=true + - ack-4.12-kube-1.26-api-removals-in-4.13=true - files: - config.yaml=configmaps/cluster-monitoring-config.yaml name: cluster-monitoring-config diff --git a/cluster-scope/overlays/nerc-ocp-prod/configmaps/admin-acks.yaml b/cluster-scope/overlays/nerc-ocp-prod/configmaps/admin-acks.yaml deleted file mode 100644 index 703c5326..00000000 --- a/cluster-scope/overlays/nerc-ocp-prod/configmaps/admin-acks.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -data: - ack-4.11-kube-1.25-api-removals-in-4.12: "true" - ack-4.12-kube-1.26-api-removals-in-4.13: "true" -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - kubernetes.io/description: Record administrator acknowledgments of update gates - defined in the admin-gates ConfigMap in the openshift-config-managed namespace. - release.openshift.io/create-only: "true" - name: admin-acks - namespace: openshift-config diff --git a/cluster-scope/overlays/nerc-ocp-prod/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-prod/kustomization.yaml index 23ab8d47..c0fbba93 100644 --- a/cluster-scope/overlays/nerc-ocp-prod/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-prod/kustomization.yaml @@ -31,7 +31,6 @@ resources: - machineconfigs/udev-rules - machineconfigs/configure-bond0 - nodenetworkconfigurationpolicies -- configmaps/admin-acks.yaml - clusterversion.yaml - certificates - consolelinks @@ -49,6 +48,12 @@ generatorOptions: disableNameSuffixHash: true configMapGenerator: +- name: admin-acks + namespace: openshift-config + behavior: merge + literals: + - ack-4.11-kube-1.25-api-removals-in-4.12=true + - ack-4.12-kube-1.26-api-removals-in-4.13=true - files: - config.yaml=configmaps/cluster-monitoring-config.yaml name: cluster-monitoring-config