add custom charts support

2024-04-30 20:08:39 +03:00
parent d78b71fb1f
commit ad5f053ec1
23 changed files with 102 additions and 61 deletions
--- a/pkg/resources/templates/helm-apps/releases/additional-modules/cert-manager.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/additional-modules/cert-manager.yml.tmpl
@@ -1,8 +1,8 @@
 - name: cert-manager
  namespace: cert-manager
  create_namespace: true
-  chart_ref: kube-forge/cert-manager
-  chart_version: v1.14.5
+  chart_ref: {{ .Modules.Additional.CertManager.ChartRef }}
+  chart_version: {{ .Modules.Additional.CertManager.ChartVersion }}
  {{- if .Modules.Additional.CertManager.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/additional-modules/ingress-nginx.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/additional-modules/ingress-nginx.yml.tmpl
@@ -1,8 +1,8 @@
 - name: ingress-nginx
  namespace: ingress-nginx
  create_namespace: true
-  chart_ref: kube-forge/ingress-nginx
-  chart_version: 4.10.1
+  chart_ref: {{ .Modules.Additional.Ingress.ChartRef }}
+  chart_version: {{ .Modules.Additional.Ingress.ChartVersion }}
  {{- if and .Modules.Additional.Ingress.Enabled (eq .Modules.Additional.Ingress.Type "nginx") }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/additional-modules/longhorn.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/additional-modules/longhorn.yml.tmpl
@@ -1,8 +1,8 @@
 - name: longhorn
  namespace: longhorn-system
  create_namespace: true
-  chart_ref: kube-forge/longhorn
-  chart_version: 1.6.1
+  chart_ref: {{ .Modules.Additional.Storage.Longhorn.ChartRef }}
+  chart_version: {{ .Modules.Additional.Storage.Longhorn.ChartVersion }}
  {{- if .Modules.Additional.Storage.Longhorn.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/additional-modules/secrets-store-csi-driver.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/additional-modules/secrets-store-csi-driver.yml.tmpl
@@ -1,6 +1,9 @@
-{{- if .Modules.Additional.Storage.SecretsStoreCsiDriver.Enabled }}
 - name: csi-secrets-store
  namespace: kube-system
-  chart_ref: kube-forge/secrets-store-csi-driver
-  chart_version: 1.4.3
-{{- end }}
+  chart_ref: {{ .Modules.Additional.Storage.SecretsStoreCsiDriver.ChartRef }}
+  chart_version: {{ .Modules.Additional.Storage.SecretsStoreCsiDriver.ChartVersion }}
+  {{- if .Modules.Additional.Storage.SecretsStoreCsiDriver.Enabled }}
+  release_state: "present"
+  {{- else }}
+  release_state: "absent"
+  {{- end }}
--- a/pkg/resources/templates/helm-apps/releases/cicd/argo-cd-ingress.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/cicd/argo-cd-ingress.yml.tmpl
@@ -1,8 +1,8 @@
 - name: argo-cd-ingress
  namespace: cicd
  create_namespace: true
-  chart_ref: kube-forge/service-ingress
-  chart_version: 0.1.0
+  chart_ref: {{ .Modules.Cicd.ArgoCd.ServiceIngress.ChartRef }}
+  chart_version: {{ .Modules.Cicd.ArgoCd.ServiceIngress.ChartVersion }}
  {{- if and .Modules.Cicd.Enabled (eq .Modules.Cicd.ArgoCd.Expose.Type "ingress") }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
@@ -1,8 +1,8 @@
 - name: argo-cd
  namespace: cicd
  create_namespace: true
-  chart_ref: kube-forge/argo-cd
-  chart_version: 6.7.12
+  chart_ref: {{ .Modules.Cicd.ArgoCd.ChartRef }}
+  chart_version: {{ .Modules.Cicd.ArgoCd.ChartVersion }}
  {{- if .Modules.Cicd.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/cicd/argo-rollouts.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/cicd/argo-rollouts.yml.tmpl
@@ -1,13 +1,13 @@
 - name: argo-rollouts
  namespace: cicd
  create_namespace: true
-  chart_ref: kube-forge/argo-rollouts
+  chart_ref: {{ .Modules.Cicd.Rollouts.ChartRef }}
+  chart_version: {{ .Modules.Cicd.Rollouts.ChartVersion }}
  {{- if and .Modules.Cicd.Enabled .Modules.Cicd.Rollouts.Enabled }}
  release_state: "present"
  {{- else }}
  release_state: "absent"
  {{- end }}
-  chart_version: 2.35.1
  values:
    installCRDs: true
    keepCRDs: false
--- a/pkg/resources/templates/helm-apps/releases/cicd/keel.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/cicd/keel.yml.tmpl
@@ -1,7 +1,7 @@
 - name: keel
  namespace: kube-system
-  chart_ref: kube-forge/keel
-  chart_version: 1.0.3
+  chart_ref: {{ .Modules.Cicd.UpdatesOperator.ChartRef }}
+  chart_version: {{ .Modules.Cicd.UpdatesOperator.ChartVersion }}
  {{- if and .Modules.Cicd.Enabled .Modules.Cicd.UpdatesOperator.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/observability/fluent-operator.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/observability/fluent-operator.yml.tmpl
@@ -1,8 +1,8 @@
 - name: fluent-operator
  namespace: observability
  create_namespace: true
-  chart_ref: kube-forge/fluent-operator
-  chart_version: 2.7.0
+  chart_ref: {{ .Modules.Observability.Logging.Operator.ChartRef }}
+  chart_version: {{ .Modules.Observability.Logging.Operator.ChartVersion }}
  {{- if and .Modules.Observability.Enabled .Modules.Observability.Logging.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/observability/loki.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/observability/loki.yml.tmpl
@@ -1,8 +1,8 @@
 - name: loki
  namespace: observability
  create_namespace: true
-  chart_ref: kube-forge/loki
-  chart_version: 5.47.2
+  chart_ref: {{ .Modules.Observability.Logging.Loki.ChartRef }}
+  chart_version: {{ .Modules.Observability.Logging.Loki.ChartVersion }}
  {{- if and .Modules.Observability.Enabled .Modules.Observability.Logging.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
@@ -1,8 +1,8 @@
 - name: observability
  namespace: observability
  create_namespace: true
-  chart_ref: kube-forge/observability
-  chart_version: 0.1.0
+  chart_ref: {{ .Modules.Observability.ChartRef }}
+  chart_version: {{ .Modules.Observability.ChartVersion }}
  {{- if .Modules.Observability.Enabled }}
  release_state: "present"
  {{- else }}
@@ -210,7 +210,6 @@
      domain: &grafanaDomain {{ .Modules.Observability.Visualization.Grafana.Expose.Domain }}
      {{- if eq .Modules.Observability.Visualization.Grafana.Expose.Type "NodePort" }}
      serviceNodePort: {{ .Modules.Observability.Visualization.Grafana.Expose.NodePortHttp }}
-
      {{- end }}
      image:
        repository: {{ .Modules.Observability.Visualization.Grafana.Image }}
@@ -224,6 +223,7 @@

      config:
        server: |
+          enable_gzip = true
          root_url = {{ if .Modules.Observability.Visualization.Grafana.Expose.Tls.Enabled }}https{{ else }}http{{ end }}://{{ .Modules.Observability.Visualization.Grafana.Expose.Domain }}

        security: |
--- a/pkg/resources/templates/helm-apps/releases/observability/opentelemetry-operator.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/observability/opentelemetry-operator.yml.tmpl
@@ -1,8 +1,8 @@
 - name: opentelemetry-operator
  namespace: observability
  create_namespace: true
-  chart_ref: kube-forge/opentelemetry-operator
-  chart_version: 0.55.0
+  chart_ref: {{ .Modules.Observability.Tracing.Operator.ChartRef }}
+  chart_version: {{ .Modules.Observability.Tracing.Operator.ChartVersion }}
  {{- if and .Modules.Observability.Enabled .Modules.Observability.Tracing.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/observability/tempo.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/observability/tempo.yml.tmpl
@@ -1,8 +1,8 @@
 - name: tempo
  namespace: observability
  create_namespace: true
-  chart_ref: kube-forge/tempo
-  chart_version: 1.7.2
+  chart_ref: {{ .Modules.Observability.Tracing.Tempo.ChartRef }}
+  chart_version: {{ .Modules.Observability.Tracing.Tempo.ChartVersion }}
  {{- if and .Modules.Observability.Enabled .Modules.Observability.Tracing.Enabled }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/registry/harbor-certificate-generator.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/registry/harbor-certificate-generator.yml.tmpl
@@ -1,8 +1,8 @@
 - name: harbor-certificate-generator
  namespace: {{ .Modules.Registry.Namespace }}
  create_namespace: true
-  chart_ref: kube-forge/certificate-generator
-  chart_version: 0.1.0
+  chart_ref: {{ .Modules.Registry.Tls.CertificateGenerator.ChartRef }}
+  chart_version: {{ .Modules.Registry.Tls.CertificateGenerator.ChartVersion }}
  {{- if and .Modules.Registry.Enabled (eq .Modules.Registry.Expose.Type "ingress") }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/registry/harbor.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/registry/harbor.yml.tmpl
@@ -1,8 +1,8 @@
 - name: harbor
  namespace: {{ .Modules.Registry.Namespace }}
  create_namespace: true
-  chart_ref: kube-forge/harbor
-  chart_version: 1.14.2
+  chart_ref: {{ .Modules.Registry.ChartRef }}
+  chart_version: {{ .Modules.Registry.ChartVersion }}
  {{- if .Modules.Registry.Enabled  }}
  release_state: "present"
  {{- else }}
--- a/pkg/resources/templates/helm-apps/releases/secrets-storage/vault.yml.tmpl
+++ b/pkg/resources/templates/helm-apps/releases/secrets-storage/vault.yml.tmpl
@@ -1,8 +1,8 @@
 - name: vault
  namespace: secrets-storage
  create_namespace: true
-  chart_ref: kube-forge/vault
-  chart_version: 0.1.0
+  chart_ref: {{ .Modules.SecretsStorage.ChartRef }}
+  chart_version: {{ .Modules.SecretsStorage.ChartVersion }}
  {{- if .Modules.SecretsStorage.Enabled }}
  release_state: "present"
  {{- else }}