Merge pull request #318 from Vikaspogu/refactor-config

move resources to component folder
Vikaspogu · Oct 2, 2024 · 3a573f8 · 3a573f8
2 parents bc10ee1 + 9a42431
commit 3a573f8
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 96 deletions.
diff --git a/.github/workflows/kubeconform.yaml b/.github/workflows/kubeconform.yaml
@@ -23,6 +23,13 @@ jobs:
       - name: Setup Workflow Tools
         run: brew install fluxcd/tap/flux kubeconform kustomize
 
+      - name: Setup policy generator
+        run: |
+          mkdir -p ${HOME}/.config/kustomize/plugin/policy.open-cluster-management.io/v1/policygenerator
+          wget https://github.com/open-cluster-management-io/policy-generator-plugin/releases/download/v1.15.0/linux-amd64-PolicyGenerator
+          chmod  +x linux-amd64-PolicyGenerator
+          mv linux-amd64-PolicyGenerator ${HOME}/.config/kustomize/plugin/policy.open-cluster-management.io/v1/policygenerator/PolicyGenerator
+
       - name: Run kubeconform
         shell: bash
         run: bash ./scripts/kubeconform.sh ${{ env.KUBERNETES_DIR }}
diff --git a/clusters/dev-acm/overlays/acm-operator/kustomization.yaml b/clusters/dev-acm/overlays/acm-operator/kustomization.yaml
diff --git a/clusters/dev-acm/overlays/external-secrets-chart/kustomization.yaml b/clusters/dev-acm/overlays/external-secrets-chart/kustomization.yaml
diff --git a/clusters/dev-acm/overlays/lvm-operator/kustomization.yaml b/clusters/dev-acm/overlays/lvm-operator/kustomization.yaml
diff --git a/clusters/dev-acm/overlays/virtualization-operator/kustomization.yaml b/clusters/dev-acm/overlays/virtualization-operator/kustomization.yaml
diff --git a/clusters/dev-acm/values.yaml b/clusters/dev-acm/values.yaml
@@ -36,7 +36,7 @@ applications:
     destination:
       namespace: open-cluster-management
     source:
-      path: clusters/dev-acm/overlays/acm-operator
+      path: components/acm-operator
 
   acm-config:
     annotations:
@@ -110,7 +110,7 @@ applications:
     destination:
       namespace: external-secrets
     source:
-      path: clusters/dev-acm/overlays/external-secrets-chart
+      path: components/external-secrets-chart
 
   gitwebhook-operator:
     annotations:
@@ -146,7 +146,7 @@ applications:
     destination:
       namespace: openshift-storage
     source:
-      path: clusters/dev-acm/overlays/lvm-operator
+      path: components/lvm-operator
 
   lvm-storage:
     annotations:
@@ -198,7 +198,7 @@ applications:
     destination:
       namespace: openshift-gitops
     source:
-      path: clusters/dev-acm/overlays/devspaces-config
+      path: components/devspaces-config
 
   rhdh-operator:
     annotations:
@@ -216,7 +216,7 @@ applications:
     destination:
       namespace: openshift-cnv
     source:
-      path: clusters/dev-acm/overlays/virtualization-operator
+      path: components/virtualization-operator
 
   virtualization-config:
     annotations:

diff --git a/components/acm-operator/subscription.yaml b/components/acm-operator/subscription.yaml
@@ -5,7 +5,7 @@ metadata:
   name: advanced-cluster-management
   namespace: open-cluster-management
 spec:
-  channel: REPLACE
+  channel: release-2.11
   installPlanApproval: Automatic
   name: advanced-cluster-management
   source: redhat-operators

diff --git a/...overlays/devspaces-config/checluster.yaml → components/devspaces-config/checluster.yaml b/...overlays/devspaces-config/checluster.yaml → components/devspaces-config/checluster.yaml
diff --git a/...rlays/devspaces-config/kustomization.yaml → ...nents/devspaces-config/kustomization.yaml b/...rlays/devspaces-config/kustomization.yaml → ...nents/devspaces-config/kustomization.yaml
diff --git a/components/external-secrets-chart/kustomization.yaml b/components/external-secrets-chart/kustomization.yaml
@@ -4,3 +4,35 @@ kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./scc.yaml
+
+helmCharts:
+  - name: external-secrets
+    releaseName: external-secrets
+    namespace: external-secrets
+    repo: https://charts.external-secrets.io
+    version: 0.10.4
+    valuesInline:
+      installCRDs: true
+
+patches:
+  - patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/securityContext
+        value: {}
+    target:
+      kind: Deployment
+      name: external-secrets
+  - patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/securityContext
+        value: {}
+    target:
+      kind: Deployment
+      name: external-secrets-cert-controller
+  - patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/securityContext
+        value: {}
+    target:
+      kind: Deployment
+      name: external-secrets-webhook
diff --git a/components/lvm-operator/subscription.yaml b/components/lvm-operator/subscription.yaml
@@ -5,7 +5,7 @@ metadata:
   name: lvms
   namespace: openshift-storage
 spec:
-  channel: <REPLACE>
+  channel: stable-4.16
   installPlanApproval: Automatic
   name: lvms-operator
   source: redhat-operators

diff --git a/components/virtualization-operator/subscription.yaml b/components/virtualization-operator/subscription.yaml
@@ -5,8 +5,15 @@ metadata:
   name: kubevirt-hyperconverged
   namespace: openshift-cnv
 spec:
-  channel: <REPLACE>
+  channel: stable
   installPlanApproval: Automatic
   name: kubevirt-hyperconverged
   source: redhat-operators
   sourceNamespace: openshift-marketplace
+  config:
+    env:
+      - name: KVM_EMULATION
+        value: "true"
+    selector:
+      matchLabels:
+        name: hyperconverged-cluster-operator