From 14e81341b02b25febfe933b69b395603ddeb4c9f Mon Sep 17 00:00:00 2001 From: tssala23 Date: Fri, 22 Nov 2024 13:34:40 -0500 Subject: [PATCH] Add overlay for albany Signed-off-by: tssala23 --- .../certificates/default-api-certificate.yaml | 14 ++++ .../default-ingress-certificate.yaml | 14 ++++ .../albany/certificates/kustomization.yaml | 5 ++ .../externalsecrets/github-group-sync.yaml | 20 ++++++ .../albany/externalsecrets/kustomization.yaml | 4 ++ .../rook-ceph-external-cluster-details.yaml | 16 +++++ .../albany/feature/odf/kustomization.yaml | 15 ++++ .../redhatcop.redhat.io/odf-node-patcher.yaml | 21 ++++++ ...xternal-storagecluster-ceph-rbd_patch.yaml | 17 +++++ .../odf/subscriptions/subscription_patch.yaml | 6 ++ .../albany/issuers/kustomization.yaml | 5 ++ .../openshift-config/kustomization.yaml | 5 ++ .../openshift-ingress/kustomization.yaml | 5 ++ .../overlays/albany/kustomization.yaml | 69 +++++++++++++++++++ .../configure-sysctl-ip-forward/Makefile | 10 +++ .../kustomization.yaml | 4 ++ .../machineconfig.yaml | 18 +++++ .../src/ip_forward.conf | 2 + .../src/machineconfig.bu | 12 ++++ .../albany/machineconfigs/kustomization.yaml | 4 ++ .../group-sync-operator/kustomization.yaml | 5 ++ .../albany/secretstores/kustomization.yaml | 7 ++ .../openshift-config/kustomization.yaml | 5 ++ .../openshift-ingress/kustomization.yaml | 5 ++ .../openshift-logging/kustomization.yaml | 5 ++ 25 files changed, 293 insertions(+) create mode 100644 cluster-scope/overlays/albany/certificates/default-api-certificate.yaml create mode 100644 cluster-scope/overlays/albany/certificates/default-ingress-certificate.yaml create mode 100644 cluster-scope/overlays/albany/certificates/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/externalsecrets/github-group-sync.yaml create mode 100644 cluster-scope/overlays/albany/externalsecrets/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml create mode 100644 cluster-scope/overlays/albany/feature/odf/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml create mode 100644 cluster-scope/overlays/albany/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml create mode 100644 cluster-scope/overlays/albany/feature/odf/subscriptions/subscription_patch.yaml create mode 100644 cluster-scope/overlays/albany/issuers/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/issuers/openshift-config/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/issuers/openshift-ingress/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/Makefile create mode 100644 cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml create mode 100644 cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf create mode 100644 cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu create mode 100644 cluster-scope/overlays/albany/machineconfigs/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/secretstores/group-sync-operator/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/secretstores/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/secretstores/openshift-config/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/secretstores/openshift-ingress/kustomization.yaml create mode 100644 cluster-scope/overlays/albany/secretstores/openshift-logging/kustomization.yaml diff --git a/cluster-scope/overlays/albany/certificates/default-api-certificate.yaml b/cluster-scope/overlays/albany/certificates/default-api-certificate.yaml new file mode 100644 index 00000000..afd2fa83 --- /dev/null +++ b/cluster-scope/overlays/albany/certificates/default-api-certificate.yaml @@ -0,0 +1,14 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: default-api-certificate + namespace: openshift-config +spec: + issuerRef: + name: letsencrypt-production-dns01 + kind: Issuer + secretName: default-api-certificate + duration: 2160h0m0s + renewBefore: 360h0m0s + dnsNames: + - "api.albany.nerc.mghpcc.org" diff --git a/cluster-scope/overlays/albany/certificates/default-ingress-certificate.yaml b/cluster-scope/overlays/albany/certificates/default-ingress-certificate.yaml new file mode 100644 index 00000000..83c6460a --- /dev/null +++ b/cluster-scope/overlays/albany/certificates/default-ingress-certificate.yaml @@ -0,0 +1,14 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: default-ingress-certificate + namespace: openshift-ingress +spec: + issuerRef: + name: letsencrypt-production-dns01 + kind: Issuer + secretName: default-ingress-certificate + duration: 2160h0m0s + renewBefore: 360h0m0s + dnsNames: + - "*.apps.albany.nerc.mghpcc.org" diff --git a/cluster-scope/overlays/albany/certificates/kustomization.yaml b/cluster-scope/overlays/albany/certificates/kustomization.yaml new file mode 100644 index 00000000..c34b4959 --- /dev/null +++ b/cluster-scope/overlays/albany/certificates/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- default-api-certificate.yaml +- default-ingress-certificate.yaml diff --git a/cluster-scope/overlays/albany/externalsecrets/github-group-sync.yaml b/cluster-scope/overlays/albany/externalsecrets/github-group-sync.yaml new file mode 100644 index 00000000..2ddc6423 --- /dev/null +++ b/cluster-scope/overlays/albany/externalsecrets/github-group-sync.yaml @@ -0,0 +1,20 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: github-group-sync + namespace: group-sync-operator +spec: + secretStoreRef: + name: nerc-secret-store + kind: SecretStore + target: + name: github-group-sync + data: + - secretKey: appId + remoteRef: + key: nerc/albany/group-sync-operator/github-group-sync-token + property: appId + - secretKey: privateKey + remoteRef: + key: nerc/albany/group-sync-operator/github-group-sync-token + property: privateKey diff --git a/cluster-scope/overlays/albany/externalsecrets/kustomization.yaml b/cluster-scope/overlays/albany/externalsecrets/kustomization.yaml new file mode 100644 index 00000000..40b9db5c --- /dev/null +++ b/cluster-scope/overlays/albany/externalsecrets/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- github-group-sync.yaml diff --git a/cluster-scope/overlays/albany/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml b/cluster-scope/overlays/albany/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml new file mode 100644 index 00000000..931c7cfc --- /dev/null +++ b/cluster-scope/overlays/albany/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml @@ -0,0 +1,16 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: rook-ceph-external-cluster-details + namespace: openshift-storage +spec: + secretStoreRef: + name: nerc-secret-store + kind: SecretStore + target: + name: rook-ceph-external-cluster-details + data: + - secretKey: external_cluster_details + remoteRef: + key: nerc/albany/openshift-storage/rook-ceph-external-cluster-details + property: external_cluster_details diff --git a/cluster-scope/overlays/albany/feature/odf/kustomization.yaml b/cluster-scope/overlays/albany/feature/odf/kustomization.yaml new file mode 100644 index 00000000..5ed7c29a --- /dev/null +++ b/cluster-scope/overlays/albany/feature/odf/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-storage + +components: + - ../../../../components/nerc-secret-store + +resources: + - ../../../../bundles/odf-external + - externalsecrets/rook-ceph-external-cluster-details.yaml + - redhatcop.redhat.io/odf-node-patcher.yaml + +patches: + - path: storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml + - path: subscriptions/subscription_patch.yaml diff --git a/cluster-scope/overlays/albany/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml b/cluster-scope/overlays/albany/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml new file mode 100644 index 00000000..f6458151 --- /dev/null +++ b/cluster-scope/overlays/albany/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml @@ -0,0 +1,21 @@ +apiVersion: redhatcop.redhat.io/v1alpha1 +kind: Patch +metadata: + name: odf-node-label-workers + namespace: openshift-storage +spec: + serviceAccountRef: + name: patcher + patches: + odf-node-label-workers: + targetObjectRef: + apiVersion: v1 + kind: Node + labelSelector: + matchLabels: + node-role.kubernetes.io/worker: "" + patchType: application/strategic-merge-patch+json + patchTemplate: | + metadata: + labels: + "cluster.ocs.openshift.io/openshift-storage": "" diff --git a/cluster-scope/overlays/albany/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml b/cluster-scope/overlays/albany/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml new file mode 100644 index 00000000..e079bcaf --- /dev/null +++ b/cluster-scope/overlays/albany/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml @@ -0,0 +1,17 @@ +allowVolumeExpansion: true +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: ocs-external-storagecluster-ceph-rbd +parameters: + clusterID: openshift-storage + csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner + csi.storage.k8s.io/controller-expand-secret-namespace: openshift-storage + csi.storage.k8s.io/fstype: ext4 + csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node + csi.storage.k8s.io/node-stage-secret-namespace: openshift-storage + csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner + csi.storage.k8s.io/provisioner-secret-namespace: openshift-storage + imageFeatures: layering + imageFormat: "2" + pool: moc-rbd-rhoai-beta-test diff --git a/cluster-scope/overlays/albany/feature/odf/subscriptions/subscription_patch.yaml b/cluster-scope/overlays/albany/feature/odf/subscriptions/subscription_patch.yaml new file mode 100644 index 00000000..fa7ecea1 --- /dev/null +++ b/cluster-scope/overlays/albany/feature/odf/subscriptions/subscription_patch.yaml @@ -0,0 +1,6 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: odf-operator +spec: + channel: stable-4.16 diff --git a/cluster-scope/overlays/albany/issuers/kustomization.yaml b/cluster-scope/overlays/albany/issuers/kustomization.yaml new file mode 100644 index 00000000..d0c8594e --- /dev/null +++ b/cluster-scope/overlays/albany/issuers/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- openshift-config +- openshift-ingress diff --git a/cluster-scope/overlays/albany/issuers/openshift-config/kustomization.yaml b/cluster-scope/overlays/albany/issuers/openshift-config/kustomization.yaml new file mode 100644 index 00000000..d362488f --- /dev/null +++ b/cluster-scope/overlays/albany/issuers/openshift-config/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-config +components: + - ../../../../components/nerc-certificate-issuer diff --git a/cluster-scope/overlays/albany/issuers/openshift-ingress/kustomization.yaml b/cluster-scope/overlays/albany/issuers/openshift-ingress/kustomization.yaml new file mode 100644 index 00000000..4fad3c21 --- /dev/null +++ b/cluster-scope/overlays/albany/issuers/openshift-ingress/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-ingress +components: + - ../../../../components/nerc-certificate-issuer diff --git a/cluster-scope/overlays/albany/kustomization.yaml b/cluster-scope/overlays/albany/kustomization.yaml new file mode 100644 index 00000000..a7e80041 --- /dev/null +++ b/cluster-scope/overlays/albany/kustomization.yaml @@ -0,0 +1,69 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + nerc.mghpcc.org/kustomized: "true" + +resources: +- ../common +- ../../bundles/node-feature-discovery +- ../../bundles/patch-operator +- ../../bundles/clusterissuer-http01 +- ../../base/rbac.authorization.k8s.io/clusterroles/allow-edit-rbac +- ../../base/core/namespaces/openshift-gitops +- externalsecrets +- issuers +- feature/odf +- machineconfigs +- certificates +- secretstores + +components: + - ../../components/nerc-oauth-github + + # this must come last in order to apply + # to all resources. + - ../../components/argocd-skip-dryrun + +generatorOptions: + disableNameSuffixHash: true + +patches: + +- patch: | + apiVersion: config.openshift.io/v1 + kind: OAuth + metadata: + name: cluster + spec: + identityProviders: + - name: github + github: + clientID: Ov23liezggam3Edgcsfs +- target: + kind: ExternalSecret + name: github-client-secret + patch: | + - op: replace + path: /spec/data/0/remoteRef/key + value: nerc/albany/openshift-config/github-client-secret + +- target: + kind: SecretStore + patch: | + - op: replace + path: /spec/provider/vault/auth/kubernetes/mountPath + value: kubernetes/albany +- target: + kind: ExternalSecret + name: aws-route53-credentials + patch: | + - op: replace + path: /spec/dataFrom/0/extract/key + value: nerc/albany/aws-route53-credentials +- target: + kind: APIServer + name: cluster + patch: | + - op: replace + path: /spec/servingCerts/namedCertificates/0/names/0 + value: api.albany.nerc.mghpcc.org diff --git a/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/Makefile b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/Makefile new file mode 100644 index 00000000..d0b76c14 --- /dev/null +++ b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/Makefile @@ -0,0 +1,10 @@ +MACHINECONFIGS = \ + machineconfig.yaml + +%.yaml: src/%.bu $(wildcard src/*.nmconnection) + butane -o $@ -d src $< + +all: $(MACHINECONFIGS) + +clean: + rm -f $(MACHINECONFIGS) diff --git a/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml new file mode 100644 index 00000000..18be132e --- /dev/null +++ b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- machineconfig.yaml diff --git a/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml new file mode 100644 index 00000000..8f4883fa --- /dev/null +++ b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml @@ -0,0 +1,18 @@ +# Generated by Butane; do not edit +apiVersion: machineconfiguration.openshift.io/v1 +kind: MachineConfig +metadata: + labels: + machineconfiguration.openshift.io/role: worker + name: configure-sysctl-ip-forward +spec: + config: + ignition: + version: 3.4.0 + storage: + files: + - contents: + compression: "" + source: data:,%23%20This%20is%20required%20to%20interact%20with%20NESE%20storage%0Anet.ipv4.ip_forward%3D1%0A + mode: 420 + path: /etc/sysctl.d/ip_forward.conf diff --git a/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf new file mode 100644 index 00000000..807879ac --- /dev/null +++ b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf @@ -0,0 +1,2 @@ +# This is required to interact with NESE storage +net.ipv4.ip_forward=1 diff --git a/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu new file mode 100644 index 00000000..dd79e7ac --- /dev/null +++ b/cluster-scope/overlays/albany/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu @@ -0,0 +1,12 @@ +variant: openshift +version: 4.15.0 +metadata: + name: configure-sysctl-ip-forward + labels: + machineconfiguration.openshift.io/role: worker +storage: + files: + - path: /etc/sysctl.d/ip_forward.conf + mode: 0644 + contents: + local: ip_forward.conf diff --git a/cluster-scope/overlays/albany/machineconfigs/kustomization.yaml b/cluster-scope/overlays/albany/machineconfigs/kustomization.yaml new file mode 100644 index 00000000..236e2cf2 --- /dev/null +++ b/cluster-scope/overlays/albany/machineconfigs/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- configure-sysctl-ip-forward/ diff --git a/cluster-scope/overlays/albany/secretstores/group-sync-operator/kustomization.yaml b/cluster-scope/overlays/albany/secretstores/group-sync-operator/kustomization.yaml new file mode 100644 index 00000000..7c10f7ec --- /dev/null +++ b/cluster-scope/overlays/albany/secretstores/group-sync-operator/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: group-sync-operator +components: + - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/albany/secretstores/kustomization.yaml b/cluster-scope/overlays/albany/secretstores/kustomization.yaml new file mode 100644 index 00000000..864474c6 --- /dev/null +++ b/cluster-scope/overlays/albany/secretstores/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- openshift-config +- openshift-ingress +- openshift-logging +- group-sync-operator diff --git a/cluster-scope/overlays/albany/secretstores/openshift-config/kustomization.yaml b/cluster-scope/overlays/albany/secretstores/openshift-config/kustomization.yaml new file mode 100644 index 00000000..9975b174 --- /dev/null +++ b/cluster-scope/overlays/albany/secretstores/openshift-config/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-config +components: + - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/albany/secretstores/openshift-ingress/kustomization.yaml b/cluster-scope/overlays/albany/secretstores/openshift-ingress/kustomization.yaml new file mode 100644 index 00000000..e36f6c33 --- /dev/null +++ b/cluster-scope/overlays/albany/secretstores/openshift-ingress/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-ingress +components: + - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/albany/secretstores/openshift-logging/kustomization.yaml b/cluster-scope/overlays/albany/secretstores/openshift-logging/kustomization.yaml new file mode 100644 index 00000000..16616f38 --- /dev/null +++ b/cluster-scope/overlays/albany/secretstores/openshift-logging/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openshift-logging +components: + - ../../../../components/nerc-secret-store