Merge pull request #7 from eclipse-tractusx/test-helm-pr-action

Test helm pr action
eclipse-tractusx · Jan 5, 2023 · 95b883c · 95b883c
2 parents 054c4bc + 6822dd8
commit 95b883c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 42 deletions.
diff --git a/charts/app-dashboard/Chart.yaml b/charts/app-dashboard/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # 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.0-RC4
+version: 1.0.0-RC5
 
 # 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

diff --git a/charts/app-dashboard/templates/ingress.yaml b/charts/app-dashboard/templates/ingress.yaml
@@ -11,38 +11,18 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
+    hosts:
+      - host: {{ .Values.simpleHost }}
         paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
+          - path: /
+            pathType: ImplementationSpecific
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}
+                name: { { $fullName } }
                 port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
+                  number: { { $svcPort } }
+    tls:
+      - secretName: tls-secret
+        hosts:
+          - {{ .Values.simpleHost }}
diff --git a/charts/app-dashboard/values.yaml b/charts/app-dashboard/values.yaml
@@ -1,6 +1,6 @@
 ignoreNamespaces: "argocd,kube-system"
 environmentName: "Unset"
-
+simpleHost: ""
 
 replicaCount: 1
 
@@ -30,19 +30,10 @@ podAnnotations: {}
 
 ingress:
   enabled: false
-  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious