From 15886832fa903c943299c04b63e1f35a3b7a25fc Mon Sep 17 00:00:00 2001 From: michaeljguarino Date: Sat, 20 Apr 2024 17:04:28 -0400 Subject: [PATCH] add operator block to values --- charts/runtime/Chart.yaml | 2 +- .../runtime/templates/helmrepositories.yaml | 2 +- charts/runtime/values.yaml | 3 + existing/README.md | 0 existing/setup/cluster.yaml | 7 ++ existing/setup/gitrepository.yaml | 7 ++ existing/setup/helmrepository.yaml | 39 ++++++++++ existing/setup/servicedeployment.yaml | 74 +++++++++++++++++++ 8 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 existing/README.md create mode 100644 existing/setup/cluster.yaml create mode 100644 existing/setup/gitrepository.yaml create mode 100644 existing/setup/helmrepository.yaml create mode 100644 existing/setup/servicedeployment.yaml diff --git a/charts/runtime/Chart.yaml b/charts/runtime/Chart.yaml index b60c4f7..7a5523a 100644 --- a/charts/runtime/Chart.yaml +++ b/charts/runtime/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: runtime description: Sets up the basic dependencies needed to get a network stack running type: application -version: 0.1.20 +version: 0.1.21 appVersion: "0.1.0" dependencies: - name: external-dns diff --git a/charts/runtime/templates/helmrepositories.yaml b/charts/runtime/templates/helmrepositories.yaml index 41647eb..2b04aa5 100644 --- a/charts/runtime/templates/helmrepositories.yaml +++ b/charts/runtime/templates/helmrepositories.yaml @@ -1,4 +1,4 @@ -{{ if .Values.flux.enabled }} +{{ if .Values.flux2.enabled }} apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: diff --git a/charts/runtime/values.yaml b/charts/runtime/values.yaml index ee1124c..f3a1596 100644 --- a/charts/runtime/values.yaml +++ b/charts/runtime/values.yaml @@ -25,6 +25,9 @@ plural-certmanager-webhook: namespace: cert-manager serviceAccountName: cert-manager +operator: + enabled: true + application: enabled: true registry: dkr.plural.sh/bootstrap diff --git a/existing/README.md b/existing/README.md new file mode 100644 index 0000000..e69de29 diff --git a/existing/setup/cluster.yaml b/existing/setup/cluster.yaml new file mode 100644 index 0000000..59f275c --- /dev/null +++ b/existing/setup/cluster.yaml @@ -0,0 +1,7 @@ +apiVersion: deployments.plural.sh/v1alpha1 +kind: Cluster +metadata: + name: mgmt + namespace: infra +spec: + handle: mgmt \ No newline at end of file diff --git a/existing/setup/gitrepository.yaml b/existing/setup/gitrepository.yaml new file mode 100644 index 0000000..6a98c5b --- /dev/null +++ b/existing/setup/gitrepository.yaml @@ -0,0 +1,7 @@ +apiVersion: deployments.plural.sh/v1alpha1 +kind: GitRepository +metadata: + name: infra + namespace: infra +spec: + url: # your repository url \ No newline at end of file diff --git a/existing/setup/helmrepository.yaml b/existing/setup/helmrepository.yaml new file mode 100644 index 0000000..42c0fd6 --- /dev/null +++ b/existing/setup/helmrepository.yaml @@ -0,0 +1,39 @@ +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: flagger +spec: + interval: 5m0s + url: https://flagger.app +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: cert-manager +spec: + interval: 5m0s + url: https://charts.jetstack.io +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: bootstrap +spec: + interval: 5m0s + url: https://pluralsh.github.io/bootstrap +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: console +spec: + interval: 5m0s + url: https://pluralsh.github.io/console +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: flux +spec: + interval: 5m0s + url: https://fluxcd-community.github.io/helm-charts \ No newline at end of file diff --git a/existing/setup/servicedeployment.yaml b/existing/setup/servicedeployment.yaml new file mode 100644 index 0000000..917b425 --- /dev/null +++ b/existing/setup/servicedeployment.yaml @@ -0,0 +1,74 @@ +apiVersion: deployments.plural.sh/v1alpha1 +kind: ServiceDeployment +metadata: + name: console + namespace: infra +spec: + namespace: plrl-console + helm: + version: "0.x.x" + chart: console + valuesFrom: + namespace: infra + name: console-values + repository: + namespace: infra + name: console + clusterRef: + kind: Cluster + name: mgmt + namespace: infra +--- +apiVersion: deployments.plural.sh/v1alpha1 +kind: ServiceDeployment +metadata: + name: cert-manager + namespace: infra +spec: + namespace: cert-manager + git: + folder: helm-values + ref: main + repositoryRef: + kind: GitRepository + name: infra + namespace: infra + helm: + version: "v1.13.3" + chart: cert-manager + valuesFiles: + - certmanager.yaml + repository: + namespace: plural-runtime + name: cert-manager + clusterRef: + kind: Cluster + name: mgmt + namespace: infra +--- +apiVersion: deployments.plural.sh/v1alpha1 +kind: ServiceDeployment +metadata: + name: plrl-runtime + namespace: infra +spec: + namespace: plrl-runtime + git: + folder: helm-values + ref: main + repositoryRef: + kind: GitRepository + name: infra + namespace: infra + helm: + version: "0.x.x" + chart: runtime + valuesFiles: + - certmanager.yaml + repository: + namespace: infra + name: bootstrap + clusterRef: + kind: Cluster + name: mgmt + namespace: infra \ No newline at end of file