Merge branch 'main' of github.com:OCP-on-NERC/nerc-ocp-config into mi…

…nio-with-dex-on-test
OCP-on-NERC · Nov 26, 2024 · 1c02fa2 · 1c02fa2
2 parents 11535e6 + 3777e4b
commit 1c02fa2
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 88 deletions.
diff --git a/cluster-scope/overlays/nerc-ocp-prod/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-prod/kustomization.yaml
@@ -138,3 +138,10 @@ patches:
     - op: replace
       path: /spec/servingCerts/namedCertificates/0/names/0
       value: api.shift.nerc.mghpcc.org
+- target:
+    kind: PersistentVolumeClaim
+    name: image-registry-storage
+  patch: |
+    - op: replace
+      path: /spec/resources/requests/storage
+      value: 750Gi
diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/kustomization.yaml
@@ -5,4 +5,3 @@ resources:
   - configure-bond0
   - configure-sysctl-ip-forward
   - hostpath-provisioner-selinux-controller.yaml
-  - pci-passthrough
diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-iommu.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-iommu.yaml
diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-vfiopci.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/100-worker-vfiopci.yaml
diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/Makefile b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/Makefile
diff --git a/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/kustomization.yaml
diff --git a/...ter-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/src/100-worker-vfiopci.bu b/...ter-scope/overlays/nerc-ocp-test/machineconfigs/pci-passthrough/src/100-worker-vfiopci.bu
diff --git a/nvidia-gpu-operator/base/gpu-cluster-policy.yaml b/nvidia-gpu-operator/base/gpu-cluster-policy.yaml
@@ -38,7 +38,7 @@ spec:
     repoConfig:
       configMapName: ""
     upgradePolicy:
-      autoUpgrade: true
+      autoUpgrade: false
       drain:
         deleteEmptyDir: false
         enable: false

diff --git a/vault/config/overlays/nerc-ocp-infra/config/nerc-ocp-test.yaml b/vault/config/overlays/nerc-ocp-infra/config/nerc-ocp-test.yaml
@@ -19,6 +19,7 @@ auth:
     - openshift-logging
     - koku-metrics-operator
     - curator-system
+    - csi-wekafsplugin
     - dex
     name: secret-reader
     policies:

diff --git a/virt/overlays/nerc-ocp-test/hyperconverged.yaml b/virt/overlays/nerc-ocp-test/hyperconverged.yaml
diff --git a/virt/overlays/nerc-ocp-test/kustomization.yaml b/virt/overlays/nerc-ocp-test/kustomization.yaml
@@ -3,6 +3,3 @@ kind: Kustomization
 namespace: openshift-cnv
 resources:
   - ../../base
-
-patches:
-- path: hyperconverged.yaml