Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move resources to component folder #318

Merged
merged 2 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/kubeconform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
15 changes: 0 additions & 15 deletions clusters/dev-acm/overlays/acm-operator/kustomization.yaml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions clusters/dev-acm/overlays/lvm-operator/kustomization.yaml

This file was deleted.

This file was deleted.

10 changes: 5 additions & 5 deletions clusters/dev-acm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -146,7 +146,7 @@ applications:
destination:
namespace: openshift-storage
source:
path: clusters/dev-acm/overlays/lvm-operator
path: components/lvm-operator

lvm-storage:
annotations:
Expand Down Expand Up @@ -198,7 +198,7 @@ applications:
destination:
namespace: openshift-gitops
source:
path: clusters/dev-acm/overlays/devspaces-config
path: components/devspaces-config

rhdh-operator:
annotations:
Expand All @@ -216,7 +216,7 @@ applications:
destination:
namespace: openshift-cnv
source:
path: clusters/dev-acm/overlays/virtualization-operator
path: components/virtualization-operator

virtualization-config:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion components/acm-operator/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 32 additions & 0 deletions components/external-secrets-chart/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion components/lvm-operator/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion components/virtualization-operator/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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