diff --git a/deployment/Chart.yaml b/deployment/Chart.yaml index f36ecdc..7550d2a 100644 --- a/deployment/Chart.yaml +++ b/deployment/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: trs-filer description: A Helm chart for Kubernetes - +icon: https://avatars.githubusercontent.com/u/60704687?s=48&v=4 # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -14,7 +14,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. -version: 0.1.0 +version: 0.1.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. diff --git a/deployment/templates/trs-filer-route.yaml b/deployment/templates/trs-filer-route.yaml index 90e969f..fa5395f 100644 --- a/deployment/templates/trs-filer-route.yaml +++ b/deployment/templates/trs-filer-route.yaml @@ -1,4 +1,4 @@ -{{ if eq .Values.clusterType "openshift" }} +{{ if .Capabilities.APIVersions.Has "route.openshift.io/v1" }} apiVersion: route.openshift.io/v1 kind: Route metadata: @@ -17,7 +17,7 @@ spec: wildcardPolicy: None status: ingress: [] -{{ else if eq .Values.clusterType "kubernetes" }} +{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }} {{ if .Values.kubernetes.ingress.enabled }} apiVersion: networking.k8s.io/v1 kind: Ingress @@ -48,4 +48,4 @@ spec: secretName: {{ .Values.trs_filer.appName }}-ingress-secret {{ end }} {{ end }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/deployment/values.yaml b/deployment/values.yaml index 7c352dd..514e4e0 100644 --- a/deployment/values.yaml +++ b/deployment/values.yaml @@ -2,12 +2,10 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -clusterType: openshift - -host_name: trs-filer-test.c03.k8s-popup.csc.fi +host_name: trs-filer-test.2.rahtiapp.fi trs_filer: - image: lvarin/trs-filer:0.1.0 + image: elixircloud/trs-filer:0.1.0 appName: trs-filer apiServer: kubernetes.default.svc:443 # address of k8s API server