refactor: mc

redhat-na-ssa · Nov 26, 2024 · f2bc22e · f2bc22e
1 parent 98d30b2
commit f2bc22e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/components/app-configs/image-puller/base/ds.yaml b/components/app-configs/image-puller/base/ds.yaml
@@ -17,9 +17,8 @@ spec:
       - name: tools
         image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest
         command:
-        - tail
-        - -f
-        - /dev/null
+        - sleep
+        - 3600
         resources:
           limits:
             memory: 20Mi

diff --git a/components/cluster-configs/machine-config/base/kustomization.yaml b/components/cluster-configs/machine-config/base/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
-  - 99-crio-disable-wipe.yaml
-  - 99-master-ssh-machineconfig.yaml
-  - 99-worker-ssh-machineconfig.yaml
+components:
+  - ../components/crio-disable-wipe
+  - ../components/ssh-config
diff --git a/...fig/base/99-crio-disable-wipe-master.yaml → ...io-disable-wipe/99-crio-disable-wipe.yaml b/...fig/base/99-crio-disable-wipe-master.yaml → ...io-disable-wipe/99-crio-disable-wipe.yaml
diff --git a/components/cluster-configs/machine-config/components/crio-disable-wipe/kustomization.yaml b/components/cluster-configs/machine-config/components/crio-disable-wipe/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - 99-crio-disable-wipe.yaml
diff --git a/...fig/base/99-master-ssh-machineconfig.yaml → ...h-config/99-master-ssh-machineconfig.yaml b/...fig/base/99-master-ssh-machineconfig.yaml → ...h-config/99-master-ssh-machineconfig.yaml
diff --git a/...fig/base/99-worker-ssh-machineconfig.yaml → ...h-config/99-worker-ssh-machineconfig.yaml b/...fig/base/99-worker-ssh-machineconfig.yaml → ...h-config/99-worker-ssh-machineconfig.yaml
diff --git a/components/cluster-configs/machine-config/components/ssh-config/kustomization.yaml b/components/cluster-configs/machine-config/components/ssh-config/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - 99-master-ssh-machineconfig.yaml
+  - 99-worker-ssh-machineconfig.yaml