From 3ae714e9255019cdf92017b9a88a4f5e7ccd28b5 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Fri, 1 Jul 2022 08:55:21 -0400 Subject: [PATCH] Configure OpenShift console Ensure that all console plugins are enabled. Add NERC custom logo. x-branch: feature/odf --- .../base/core/configmaps/nerc-logo/configmap.yaml | 8 ++++++++ .../core/configmaps/nerc-logo/kustomization.yaml | 4 ++++ .../consoles/cluster/console.yaml | 13 +++++++++++++ .../consoles/cluster/kustomization.yaml | 4 ++++ cluster-scope/bundles/console/kustomization.yaml | 5 +++++ cluster-scope/overlays/common/kustomization.yaml | 1 + .../cluster_patch.yaml | 7 +++++++ .../overlays/nerc-ocp-infra/kustomization.yaml | 3 ++- 8 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 cluster-scope/base/core/configmaps/nerc-logo/configmap.yaml create mode 100644 cluster-scope/base/core/configmaps/nerc-logo/kustomization.yaml create mode 100644 cluster-scope/base/operator.openshift.io/consoles/cluster/console.yaml create mode 100644 cluster-scope/base/operator.openshift.io/consoles/cluster/kustomization.yaml create mode 100644 cluster-scope/bundles/console/kustomization.yaml create mode 100644 cluster-scope/overlays/nerc-ocp-infra/consoles.operator.openshift.io/cluster_patch.yaml diff --git a/cluster-scope/base/core/configmaps/nerc-logo/configmap.yaml b/cluster-scope/base/core/configmaps/nerc-logo/configmap.yaml new file mode 100644 index 00000000..6f23e435 --- /dev/null +++ b/cluster-scope/base/core/configmaps/nerc-logo/configmap.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +binaryData: + nerc-logo.png: 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 +kind: ConfigMap +metadata: + creationTimestamp: null + name: nerc-logo + namespace: openshift-config diff --git a/cluster-scope/base/core/configmaps/nerc-logo/kustomization.yaml b/cluster-scope/base/core/configmaps/nerc-logo/kustomization.yaml new file mode 100644 index 00000000..58e32056 --- /dev/null +++ b/cluster-scope/base/core/configmaps/nerc-logo/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - configmap.yaml diff --git a/cluster-scope/base/operator.openshift.io/consoles/cluster/console.yaml b/cluster-scope/base/operator.openshift.io/consoles/cluster/console.yaml new file mode 100644 index 00000000..f2959e30 --- /dev/null +++ b/cluster-scope/base/operator.openshift.io/consoles/cluster/console.yaml @@ -0,0 +1,13 @@ +apiVersion: operator.openshift.io/v1 +kind: Console +metadata: + name: cluster +spec: + plugins: + - odf-console + - acm + - mce + customization: + customLogoFile: + name: nerc-logo + key: nerc-logo.png diff --git a/cluster-scope/base/operator.openshift.io/consoles/cluster/kustomization.yaml b/cluster-scope/base/operator.openshift.io/consoles/cluster/kustomization.yaml new file mode 100644 index 00000000..984c93c5 --- /dev/null +++ b/cluster-scope/base/operator.openshift.io/consoles/cluster/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - console.yaml diff --git a/cluster-scope/bundles/console/kustomization.yaml b/cluster-scope/bundles/console/kustomization.yaml new file mode 100644 index 00000000..e910fce0 --- /dev/null +++ b/cluster-scope/bundles/console/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base/operator.openshift.io/consoles/cluster +- ../../base/core/configmaps/nerc-logo diff --git a/cluster-scope/overlays/common/kustomization.yaml b/cluster-scope/overlays/common/kustomization.yaml index 8b365dbf..5717451e 100644 --- a/cluster-scope/overlays/common/kustomization.yaml +++ b/cluster-scope/overlays/common/kustomization.yaml @@ -9,3 +9,4 @@ resources: - ../../base/rbac.authorization.k8s.io/clusterrolebindings/self-provisioners - ../../bundles/cluster-admin-rbac/ - ../../bundles/nmstate +- ../../bundles/console diff --git a/cluster-scope/overlays/nerc-ocp-infra/consoles.operator.openshift.io/cluster_patch.yaml b/cluster-scope/overlays/nerc-ocp-infra/consoles.operator.openshift.io/cluster_patch.yaml new file mode 100644 index 00000000..88dc1e29 --- /dev/null +++ b/cluster-scope/overlays/nerc-ocp-infra/consoles.operator.openshift.io/cluster_patch.yaml @@ -0,0 +1,7 @@ +apiVersion: operator.openshift.io/v1 +kind: Console +metadata: + name: cluster +spec: + customization: + customProductName: NERC OCP Infra Cluster diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml index fef742c8..f0a4310f 100644 --- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization commonLabels: nerc.mghpcc.org/kustomized: "true" + resources: - ../common - ../../bundles/openshift-gitops @@ -13,7 +14,6 @@ resources: - machineconfigs/mellanox-udev-rules - machineconfigs/configure-bond0 - nodenetworkconfigurationpolicies/vlan-2177-nese.yaml - - groupsyncs/github-ocp-on-nerc.yaml - clusterrolebindings/nerc-ops-cluster-reader.yaml - clusterrolebindings/nerc-ops-sudoers.yaml @@ -21,3 +21,4 @@ resources: patches: - path: oauths/cluster_patch.yaml +- path: consoles.operator.openshift.io/cluster_patch.yaml