Merge pull request #149 from Tricentis/update/scenario

Scenario - Add service annotations and remove ingress v1beta1
Tricentis · Oct 10, 2023 · d19d32c · d19d32c
2 parents c3e0011 + 72a50c8
commit d19d32c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/Charts/qtest-scenario/Chart.yaml b/Charts/qtest-scenario/Chart.yaml
@@ -30,7 +30,7 @@ icon: https://images.g2crowd.com/uploads/product/image/social_landscape/social_l
 # 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: 1.0.12
+version: 1.0.13
 # 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-scenario/templates/ingress-class.yaml b/Charts/qtest-scenario/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-scenario.fullname" . }}-ingressclass"

diff --git a/Charts/qtest-scenario/templates/ingress.yaml b/Charts/qtest-scenario/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-scenario/values.yaml b/Charts/qtest-scenario/values.yaml
@@ -48,11 +48,11 @@ rollouts:
     - pause: {duration: 10s}
 service:
   type: LoadBalancer
+  annotations: {}
   port: 6080
   targetPort: 6080
   targetHttpsPort: 6443
   serviceName: qtest-scenario-service
-  annotations: {}
 extraInitContainers: []
 extraContainers: []
 extraArgs: []