Merge pull request #50 from dnvgl/support3

Update apiVersions to support KubeIT 3.0

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.2.0
+version: 0.3.0
 
 # 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/templates/_gitRepository.tpl

@@ -1,7 +1,7 @@
 {{- define "bootstrap.gitRepository" }}
 
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: {{ include "bootstrap.gitRepoName" . }}

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

@@ -1,7 +1,11 @@
 {{- define "bootstrap.imageAutomation" }}
 
 ---
-apiVersion: image.toolkit.fluxcd.io/v1beta1
+{{- if $.Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1" }}
+apiVersion: image.toolkit.fluxcd.io/v1
+{{- else }}
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+{{- end }}
 kind: ImageUpdateAutomation
 metadata:
   name: image-update-automation

charts/flux-bootstrap/templates/_kustomization.tpl

@@ -1,6 +1,10 @@
 {{- define "bootstrap.kustomization" }}
 ---
+{{- if $.Capabilities.APIVersions.Has "kustomize.toolkit.fluxcd.io/v1" }}
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+{{- else }}
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+{{- end }}
 kind: Kustomization
 metadata:
   name: {{ include "bootstrap.kustomizationName" . }}

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

@@ -1,6 +1,10 @@
 {{- define "bootstrap.serviceMeshChartHelmRepository" }}
 ---
+{{- if $.Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
+apiVersion: source.toolkit.fluxcd.io/v1
+{{- else }}
 apiVersion: source.toolkit.fluxcd.io/v1beta2
+{{- end }}
 kind: HelmRepository
 metadata:
   name: service-mesh-chart

charts/platform-service/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.1"
 description: Platform service chart
 name: platform-service
-version: 1.4.6
+version: 1.4.7

charts/platform-service/templates/authorizationPolicy.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.authorizationPolicy.enabled }}
-apiVersion: security.istio.io/v1beta1
+apiVersion: security.istio.io/v1
 kind: AuthorizationPolicy
 metadata:
   name: {{ include "platform-service.fullname" . }}

charts/platform-service/templates/destinationrules.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.defaultRouting.enabled}}
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1
 kind: DestinationRule
 metadata:
   name: {{ include "platform-service.fullname" . }}-destinationrule

charts/platform-service/templates/horizontal-pod-autoscaler.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "platform-service.fullname" . }}-hpa

charts/platform-service/templates/image-policy.yaml

@@ -1,5 +1,9 @@
 {{- if .Values.image.fluxAutomation.enabled -}}
-apiVersion: image.toolkit.fluxcd.io/v1beta1
+{{- if $.Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1" }}
+apiVersion: image.toolkit.fluxcd.io/v1
+{{- else }}
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+{{- end }}
 kind: ImagePolicy
 metadata:
   name: {{ include "platform-service.name" . }}