Merge pull request #51 from dnvgl/fix-support3

Fix for flux-bootstrap

Author: slawekww

charts/flux-bootstrap/Chart.yaml

@@ -15,7 +15,7 @@ type: library
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/flux-bootstrap/README.md

@@ -6,6 +6,7 @@ The Bootstrap Chart is designed to generate all necessary manifests for a specif
 
 - Kubernetes 1.16+
 - Helm 3.0+
+- KubeIT 3.0+ if chart version =>0.3.1
 
 ## Installation
 

charts/flux-bootstrap/templates/_all-manifests.tpl

@@ -55,6 +55,7 @@
   "fluxSshSecretNameTemplate" ($values.fluxSshSecretNameTemplate | default "gitops-repo-key")
   "gitRepoNameTemplate" ( $values.gitRepoNameTemplate | default "tenant" )
   "kustomizationNameTemplate" ( $values.kustomizationNameTemplate | default "tenant")
+  "capabilities" $.Capabilities
   "Template" $.Template) }}
 
 {{- include "bootstrap.gitRepository" $context }}

charts/flux-bootstrap/templates/_image-automation.tpl

@@ -1,7 +1,7 @@
 {{- define "bootstrap.imageAutomation" }}
 
 ---
-{{- if $.Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1" }}
+{{- if .capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1" }}
 apiVersion: image.toolkit.fluxcd.io/v1
 {{- else }}
 apiVersion: image.toolkit.fluxcd.io/v1beta2

charts/flux-bootstrap/templates/_kustomization.tpl

@@ -1,6 +1,6 @@
 {{- define "bootstrap.kustomization" }}
 ---
-{{- if $.Capabilities.APIVersions.Has "kustomize.toolkit.fluxcd.io/v1" }}
+{{- if .capabilities.APIVersions.Has "kustomize.toolkit.fluxcd.io/v1" }}
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 {{- else }}
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2

charts/flux-bootstrap/templates/_service-mesh-chart-helm-repository.tpl

@@ -1,6 +1,6 @@
 {{- define "bootstrap.serviceMeshChartHelmRepository" }}
 ---
-{{- if $.Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
+{{- if .capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
 apiVersion: source.toolkit.fluxcd.io/v1
 {{- else }}
 apiVersion: source.toolkit.fluxcd.io/v1beta2

charts/flux-bootstrap/templates/_ssh-key-secrets.tpl

@@ -1,7 +1,7 @@
 {{- define "bootstrap.sshKeySecrets" }}
 ---
 # Source: akv-secrets/templates/secret-sync.yaml
-{{- if .Capabilities.APIVersions.Has "external-secrets.io/v1" }}
+{{- if .capabilities.APIVersions.Has "external-secrets.io/v1" }}
 apiVersion: external-secrets.io/v1
 {{- else }}
 apiVersion: external-secrets.io/v1beta1
@@ -41,7 +41,7 @@ metadata:
   namespace: {{ .namespace }}
 ---
 # Source: akv-secrets/templates/secret-sync.yaml
-{{- if .Capabilities.APIVersions.Has "external-secrets.io/v1" }}
+{{- if .capabilities.APIVersions.Has "external-secrets.io/v1" }}
 apiVersion: external-secrets.io/v1
 {{- else }}
 apiVersion: external-secrets.io/v1beta1