Merge pull request #147 from Tricentis/update/launch

Launch - add service annotations, remove ingress v1beta1
Tricentis · Oct 10, 2023 · e85eaa7 · e85eaa7
2 parents 3592284 + a8791cc
commit e85eaa7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Charts/qtest-launch/Chart.yaml b/Charts/qtest-launch/Chart.yaml
@@ -30,7 +30,7 @@ kubeVersion: ">=1.18.0-0"
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.0.8
+version: 1.0.9
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/Charts/qtest-launch/templates/ingress-class.yaml b/Charts/qtest-launch/templates/ingress-class.yaml
@@ -1,9 +1,5 @@
 {{- if .Values.ingressClass.enabled }}
-{{- if semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
-{{- else -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- end}}
 kind: IngressClass
 metadata:
   name: "{{ include "qtest-launch.fullname" . }}-ingressclass"

diff --git a/Charts/qtest-launch/templates/ingress.yaml b/Charts/qtest-launch/templates/ingress.yaml
@@ -1,11 +1,7 @@
 {{- if .Values.ingress.enabled -}}
   {{- $paths := .Values.ingress.paths -}}
   {{- $extraPaths := .Values.ingress.extraPaths -}}
-{{- if semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
-{{- else -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- end}}
 kind: Ingress
 metadata:
   name: {{ .Values.ingress.name }}

diff --git a/Charts/qtest-launch/templates/service.yaml b/Charts/qtest-launch/templates/service.yaml
@@ -3,6 +3,10 @@ kind: Service
 metadata:
   name: {{ .Values.service.serviceName }}
   namespace: {{ .Values.namespace.name }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app: qtest-launch
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -31,6 +35,10 @@ kind: Service
 metadata:
   name: {{ .Values.service.serviceName }}-canary
   namespace: {{ .Values.namespace.name }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app: qtest-launch
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

diff --git a/Charts/qtest-launch/values.yaml b/Charts/qtest-launch/values.yaml
@@ -48,6 +48,7 @@ rollouts:
     - pause: {duration: 10s}
 service:
   type: LoadBalancer
+  annotations: {}
   port: 3080
   targetPort: 3080
   targetHttpsPort: 3443