From f2bc22e55fa7a6e0bbef48a1e7a44defc9441511 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Tue, 26 Nov 2024 14:17:46 -0600 Subject: [PATCH] refactor: mc --- components/app-configs/image-puller/base/ds.yaml | 5 ++--- .../cluster-configs/machine-config/base/kustomization.yaml | 7 +++---- .../crio-disable-wipe/99-crio-disable-wipe.yaml} | 0 .../components/crio-disable-wipe/kustomization.yaml | 5 +++++ .../ssh-config}/99-master-ssh-machineconfig.yaml | 0 .../ssh-config}/99-worker-ssh-machineconfig.yaml | 0 .../components/ssh-config/kustomization.yaml | 6 ++++++ 7 files changed, 16 insertions(+), 7 deletions(-) rename components/cluster-configs/machine-config/{base/99-crio-disable-wipe-master.yaml => components/crio-disable-wipe/99-crio-disable-wipe.yaml} (100%) create mode 100644 components/cluster-configs/machine-config/components/crio-disable-wipe/kustomization.yaml rename components/cluster-configs/machine-config/{base => components/ssh-config}/99-master-ssh-machineconfig.yaml (100%) rename components/cluster-configs/machine-config/{base => components/ssh-config}/99-worker-ssh-machineconfig.yaml (100%) create mode 100644 components/cluster-configs/machine-config/components/ssh-config/kustomization.yaml diff --git a/components/app-configs/image-puller/base/ds.yaml b/components/app-configs/image-puller/base/ds.yaml index f24b4ad6..4ccadf37 100644 --- 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 index cc793354..3758306e 100644 --- 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/components/cluster-configs/machine-config/base/99-crio-disable-wipe-master.yaml b/components/cluster-configs/machine-config/components/crio-disable-wipe/99-crio-disable-wipe.yaml similarity index 100% rename from components/cluster-configs/machine-config/base/99-crio-disable-wipe-master.yaml rename to components/cluster-configs/machine-config/components/crio-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 new file mode 100644 index 00000000..364a3825 --- /dev/null +++ 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/components/cluster-configs/machine-config/base/99-master-ssh-machineconfig.yaml b/components/cluster-configs/machine-config/components/ssh-config/99-master-ssh-machineconfig.yaml similarity index 100% rename from components/cluster-configs/machine-config/base/99-master-ssh-machineconfig.yaml rename to components/cluster-configs/machine-config/components/ssh-config/99-master-ssh-machineconfig.yaml diff --git a/components/cluster-configs/machine-config/base/99-worker-ssh-machineconfig.yaml b/components/cluster-configs/machine-config/components/ssh-config/99-worker-ssh-machineconfig.yaml similarity index 100% rename from components/cluster-configs/machine-config/base/99-worker-ssh-machineconfig.yaml rename to components/cluster-configs/machine-config/components/ssh-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 new file mode 100644 index 00000000..9ab56c59 --- /dev/null +++ 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