From 020009809b280516392f047b8800de7ffd365993 Mon Sep 17 00:00:00 2001 From: tssala23 Date: Tue, 3 Dec 2024 11:47:45 -0500 Subject: [PATCH] Remove test-2 resources Signed-off-by: tssala23 --- .../certificates/default-api-certificate.yaml | 14 ---- .../default-ingress-certificate.yaml | 14 ---- .../certificates/kustomization.yaml | 5 -- .../externalsecrets/github-group-sync.yaml | 20 ----- .../externalsecrets/kustomization.yaml | 4 - .../rook-ceph-external-cluster-details.yaml | 16 ---- .../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 -- .../issuers/kustomization.yaml | 5 -- .../openshift-config/kustomization.yaml | 5 -- .../openshift-ingress/kustomization.yaml | 5 -- .../nerc-ocp-test-2/kustomization.yaml | 74 ------------------- .../block-public-ssh/kustomization.yaml | 5 -- .../machineconfig-controller.yaml | 26 ------- .../machineconfig-worker.yaml | 26 ------- .../configure-sysctl-ip-forward/Makefile | 10 --- .../kustomization.yaml | 4 - .../machineconfig.yaml | 18 ----- .../src/ip_forward.conf | 2 - .../src/machineconfig.bu | 12 --- .../machineconfigs/kustomization.yaml | 5 -- .../eth-nese.yaml | 17 ----- .../kustomization.yaml | 5 -- .../vlan-211.yaml | 37 ---------- .../group-sync-operator/kustomization.yaml | 5 -- .../secretstores/kustomization.yaml | 7 -- .../openshift-config/kustomization.yaml | 5 -- .../openshift-ingress/kustomization.yaml | 5 -- .../openshift-logging/kustomization.yaml | 5 -- .../nerc-ocp-test-2/kustomization.yaml | 5 -- 32 files changed, 420 deletions(-) delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/certificates/default-api-certificate.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/certificates/default-ingress-certificate.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/certificates/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/github-group-sync.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/feature/odf/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/feature/odf/subscriptions/subscription-patch.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/issuers/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-config/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-ingress/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-controller.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-worker.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/Makefile delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/eth-nese.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/vlan-211.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/secretstores/group-sync-operator/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/secretstores/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-config/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-ingress/kustomization.yaml delete mode 100644 cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-logging/kustomization.yaml delete mode 100644 fake-metrics-server/overlays/nerc-ocp-test-2/kustomization.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test-2/certificates/default-api-certificate.yaml b/cluster-scope/overlays/nerc-ocp-test-2/certificates/default-api-certificate.yaml deleted file mode 100644 index e2fc1369..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/certificates/default-api-certificate.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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.nerc-ocp-test-2.nerc.mghpcc.org" diff --git a/cluster-scope/overlays/nerc-ocp-test-2/certificates/default-ingress-certificate.yaml b/cluster-scope/overlays/nerc-ocp-test-2/certificates/default-ingress-certificate.yaml deleted file mode 100644 index 427fbfe7..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/certificates/default-ingress-certificate.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: default-ingress-certificate - namespace: openshift-config -spec: - issuerRef: - name: letsencrypt-production-dns01 - kind: Issuer - secretName: default-ingress-certificate - duration: 2160h0m0s - renewBefore: 360h0m0s - dnsNames: - - "*.apps.nerc-ocp-test-2.nerc.mghpcc.org" diff --git a/cluster-scope/overlays/nerc-ocp-test-2/certificates/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/certificates/kustomization.yaml deleted file mode 100644 index c34b4959..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/certificates/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- default-api-certificate.yaml -- default-ingress-certificate.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/github-group-sync.yaml b/cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/github-group-sync.yaml deleted file mode 100644 index e3eec3f1..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/github-group-sync.yaml +++ /dev/null @@ -1,20 +0,0 @@ -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/nerc-ocp-test-2/group-sync-operator/github-group-sync-token - property: appId - - secretKey: privateKey - remoteRef: - key: nerc/nerc-ocp-test-2/group-sync-operator/github-group-sync-token - property: privateKey diff --git a/cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/kustomization.yaml deleted file mode 100644 index 40b9db5c..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/externalsecrets/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- github-group-sync.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml b/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml deleted file mode 100644 index 14f01554..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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/nerc-ocp-test-2/openshift-storage/rook-ceph-external-cluster-details - property: external_cluster_details diff --git a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/kustomization.yaml deleted file mode 100644 index 94f06d94..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -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/nerc-ocp-test-2/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml b/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml deleted file mode 100644 index f6458151..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml +++ /dev/null @@ -1,21 +0,0 @@ -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/nerc-ocp-test-2/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml b/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml deleted file mode 100644 index 01610833..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml +++ /dev/null @@ -1,17 +0,0 @@ -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-openshift-test2 diff --git a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/subscriptions/subscription-patch.yaml b/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/subscriptions/subscription-patch.yaml deleted file mode 100644 index fa7ecea1..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/feature/odf/subscriptions/subscription-patch.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: odf-operator -spec: - channel: stable-4.16 diff --git a/cluster-scope/overlays/nerc-ocp-test-2/issuers/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/issuers/kustomization.yaml deleted file mode 100644 index d0c8594e..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/issuers/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- openshift-config -- openshift-ingress diff --git a/cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-config/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-config/kustomization.yaml deleted file mode 100644 index d362488f..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-config/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-config -components: - - ../../../../components/nerc-certificate-issuer diff --git a/cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-ingress/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-ingress/kustomization.yaml deleted file mode 100644 index 4fad3c21..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/issuers/openshift-ingress/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-ingress -components: - - ../../../../components/nerc-certificate-issuer diff --git a/cluster-scope/overlays/nerc-ocp-test-2/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/kustomization.yaml deleted file mode 100644 index a31f828d..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/kustomization.yaml +++ /dev/null @@ -1,74 +0,0 @@ -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/rbac.authorization.k8s.io/clusterrolebindings/kruize-admins -- ../../base/core/namespaces/openshift-gitops -- externalsecrets -- issuers -- feature/odf -- certificates -- nodenetworkconfigurationpolicies -- secretstores -- machineconfigs - -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: Ov23liGZVyeMB2D96Wiq - teams: - - ocp-on-nerc/nerc-ops - - ocp-on-nerc/kruize-admins -- target: - kind: ExternalSecret - name: github-client-secret - patch: | - - op: replace - path: /spec/data/0/remoteRef/key - value: nerc/nerc-ocp-test-2/openshift-config/github-client-secret - -- target: - kind: SecretStore - patch: | - - op: replace - path: /spec/provider/vault/auth/kubernetes/mountPath - value: kubernetes/nerc-ocp-test-2 -- target: - kind: ExternalSecret - name: aws-route53-credentials - patch: | - - op: replace - path: /spec/dataFrom/0/extract/key - value: nerc/nerc-ocp-test-2/aws-route53-credentials -- target: - kind: APIServer - name: cluster - patch: | - - op: replace - path: /spec/servingCerts/namedCertificates/0/names/0 - value: api.nerc-ocp-test-2.nerc.mghpcc.org diff --git a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/kustomization.yaml deleted file mode 100644 index afdd85d5..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- machineconfig-controller.yaml -- machineconfig-worker.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-controller.yaml b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-controller.yaml deleted file mode 100644 index 568de7a8..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-controller.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: machineconfiguration.openshift.io/v1 -kind: MachineConfig -metadata: - labels: - machineconfiguration.openshift.io/role: master - name: block-public-ssh-controller -spec: - config: - ignition: - version: 3.2.0 - systemd: - units: - - name: block-public-ssh.service - enabled: true - contents: | - [Unit] - Description=Block ssh from anywhere but private network - Requires=sshd.service - Before=sshd.service - - [Service] - Type=oneshot - ExecStart=/usr/sbin/iptables -I INPUT -p tcp --dport 22 ! -s 192.168.50.0/24 -j DROP - - [Install] - WantedBy=multi-user.target diff --git a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-worker.yaml b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-worker.yaml deleted file mode 100644 index 919657d4..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/block-public-ssh/machineconfig-worker.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: machineconfiguration.openshift.io/v1 -kind: MachineConfig -metadata: - labels: - machineconfiguration.openshift.io/role: worker - name: block-public-ssh-worker -spec: - config: - ignition: - version: 3.2.0 - systemd: - units: - - name: block-public-ssh.service - enabled: true - contents: | - [Unit] - Description=Block ssh from anywhere but private network - Requires=sshd.service - Before=sshd.service - - [Service] - Type=oneshot - ExecStart=/usr/sbin/iptables -I INPUT -p tcp --dport 22 ! -s 192.168.50.0/24 -j DROP - - [Install] - WantedBy=multi-user.target diff --git a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/Makefile b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/Makefile deleted file mode 100644 index d0b76c14..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -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/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml deleted file mode 100644 index 18be132e..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- machineconfig.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml deleted file mode 100644 index 8f4883fa..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/machineconfig.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# 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/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf deleted file mode 100644 index 807879ac..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/ip_forward.conf +++ /dev/null @@ -1,2 +0,0 @@ -# This is required to interact with NESE storage -net.ipv4.ip_forward=1 diff --git a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu deleted file mode 100644 index dd79e7ac..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/configure-sysctl-ip-forward/src/machineconfig.bu +++ /dev/null @@ -1,12 +0,0 @@ -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/nerc-ocp-test-2/machineconfigs/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/kustomization.yaml deleted file mode 100644 index eef2dcac..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/machineconfigs/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- configure-sysctl-ip-forward/ -- block-public-ssh/ diff --git a/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/eth-nese.yaml b/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/eth-nese.yaml deleted file mode 100644 index 5fb9ee87..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/eth-nese.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: nmstate.io/v1 -kind: NodeNetworkConfigurationPolicy -metadata: - name: eth-nese -spec: - nodeSelector: - node-role.kubernetes.io/worker: "" - desiredState: - interfaces: - - name: eno2 - type: ethernet - state: up - ipv4: - dhcp: true - enabled: true - auto-routes: true - mtu: 9000 diff --git a/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/kustomization.yaml deleted file mode 100644 index 661d0473..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- eth-nese.yaml -- vlan-211.yaml diff --git a/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/vlan-211.yaml b/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/vlan-211.yaml deleted file mode 100644 index 6bfe81fb..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/nodenetworkconfigurationpolicies/vlan-211.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: nmstate.io/v1 -kind: NodeNetworkConfigurationPolicy -metadata: - name: vlan-211 -spec: - nodeSelector: - kubernetes.io/hostname: "wrk-5" - desiredState: - interfaces: - - name: eno1np0.211 - type: vlan - state: up - ipv4: - # DHCP for this network is currently managed by Neutron, and Neutron is - # unable to provide DHCP service to trunked interfaces. We need to manually - # manage address assignment here until we move DHCP away from Neutron. - enabled: true - dhcp: false - auto-routes: false - address: - - ip: 10.0.120.39 - prefix-length: 22 - vlan: - base-iface: eno1np0 - id: 211 - mtu: 9000 - routes: - config: - - destination: 10.255.116.0/23 - next-hop-address: 10.0.120.1 - next-hop-interface: vlan-211 - - destination: 10.247.236.0/25 - next-hop-address: 10.0.120.1 - next-hop-interface: vlan-211 - - destination: 140.247.236.0/25 - next-hop-address: 10.0.120.1 - next-hop-interface: vlan-211 diff --git a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/group-sync-operator/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/secretstores/group-sync-operator/kustomization.yaml deleted file mode 100644 index 7c10f7ec..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/group-sync-operator/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: group-sync-operator -components: - - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/secretstores/kustomization.yaml deleted file mode 100644 index 864474c6..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- openshift-config -- openshift-ingress -- openshift-logging -- group-sync-operator diff --git a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-config/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-config/kustomization.yaml deleted file mode 100644 index 9975b174..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-config/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-config -components: - - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-ingress/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-ingress/kustomization.yaml deleted file mode 100644 index e36f6c33..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-ingress/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-ingress -components: - - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-logging/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-logging/kustomization.yaml deleted file mode 100644 index 16616f38..00000000 --- a/cluster-scope/overlays/nerc-ocp-test-2/secretstores/openshift-logging/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-logging -components: - - ../../../../components/nerc-secret-store diff --git a/fake-metrics-server/overlays/nerc-ocp-test-2/kustomization.yaml b/fake-metrics-server/overlays/nerc-ocp-test-2/kustomization.yaml deleted file mode 100644 index c81cb0ea..00000000 --- a/fake-metrics-server/overlays/nerc-ocp-test-2/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-storage -resources: -- ../nerc-ocp-infra