-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
We eventually require the admin-acks ConfigMap [1] in all of our clusters. Rather than duplicating it everywhere, including it in base and use a ConfigMap generator to populate it in each overlay. Part-of: nerc-project/operations#285 [1]: https://docs.openshift.com/container-platform/4.14/updating/preparing_for_updates/updating-cluster-prepare.html#update-preparing-ack_updating-cluster-prepare
- Loading branch information
Showing
6 changed files
with
19 additions
and
21 deletions.
There are no files selected for viewing
7 changes: 2 additions & 5 deletions
7
...nerc-ocp-infra/configmaps/admin-acks.yaml → ...core/configmaps/admin-acks/configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: {} |
4 changes: 4 additions & 0 deletions
4
cluster-scope/base/core/configmaps/admin-acks/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
apiVersion: kustomize.config.k8s.io/v1beta1 | ||
kind: Kustomization | ||
resources: | ||
- configmap.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
cluster-scope/overlays/nerc-ocp-prod/configmaps/admin-acks.yaml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters