Merge pull request #11 from NBISweden/tls-config

ingress host and service port fix

charts/landing-pages-chart/Chart.yaml

@@ -15,7 +15,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: 0.1.1
+version: 0.1.2
 
 # 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/landing-pages-chart/templates/ingress.yaml

@@ -2,10 +2,11 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    nginx.ingress.kubernetes.io/upstream-vhost: {{ .Values.s3Host}}
+    cert-manager.io/cluster-issuer: {{ .Values.clusterIssuer }}
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/upstream-vhost: {{ .Values.s3Host }}
     nginx.ingress.kubernetes.io/secure-backends: "true"
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-    nginx.ingress.kubernetes.io/rewrite-log: "true"
     nginx.ingress.kubernetes.io/rewrite-target: {{ .Values.bucketUrl }}/$1
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/app-root: /index.html
@@ -20,7 +21,8 @@ spec:
     secretName: {{ .Values.secretName }}
 {{  end  }}
   rules:
-  - http:
+  - host: {{ .Values.domainName }}
+    http:
       paths:
       - backend:
           service:

charts/landing-pages-chart/templates/service.yaml

@@ -6,4 +6,8 @@ metadata:
 spec:
   externalName: {{ .Values.s3Host }}
   sessionAffinity: None
-  type: ExternalName
+  type: ExternalName
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 443

charts/landing-pages-chart/values.yaml

@@ -5,4 +5,5 @@ bucketUrl:
 
 tls: false
 domainName: 
-secretName: 
+secretName:
+clusterIssuer: 

web/config.toml

@@ -1,4 +1,4 @@
-baseurl = "https://foo.bar.com"
+baseurl = "https://lp.bp.nbis.se"
 title = "Bigpicture datasets"
 languageCode = "en-us"