tls

adrielparedes · Nov 2, 2022 · 17c478c · 17c478c
1 parent 8caa897
commit 17c478c
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ deploy-core-production: push-core-image
 	kubectl apply -k openscore-core/k8s/overlays/production
 
 deploy-ui-production: push-ui-image
-	kubectl apply -k openscore-ui/k8s/base
+	kubectl apply -k openscore-ui/k8s/overlays/production
 
 deploy-core-local: push-core-image
 	kubectl apply -k openscore-core/k8s/overlays/local

diff --git a/openscore-core/k8s/base/ingress.yaml b/openscore-core/k8s/base/ingress.yaml
@@ -3,6 +3,8 @@ kind: Ingress
 metadata:
   name: openscore-core
   namespace: openscore
+  annotations:
+    kubernetes.io/ingress.class:  nginx
 spec:
   ingressClassName: nginx
   rules:

diff --git a/openscore-core/k8s/overlays/production/ingress-patch.yaml b/openscore-core/k8s/overlays/production/ingress-patch.yaml
@@ -0,0 +1,12 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: openscore-core
+  namespace: openscore
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+spec:
+  tls:
+  - hosts:
+    - rhopenscore.com
+    secretName: tls-core
diff --git a/openscore-core/k8s/overlays/production/kustomization.yaml b/openscore-core/k8s/overlays/production/kustomization.yaml
@@ -1,4 +1,5 @@
 bases:
 - ../../base
 patchesStrategicMerge:
-- deployment-patch.yaml
+- deployment-patch.yaml
+- ingress-patch.yaml
diff --git a/openscore-ui/.env.production b/openscore-ui/.env.production
@@ -1 +1 @@
-NEXT_PUBLIC_BASE_URL=http://rhopenscore.com
+NEXT_PUBLIC_BASE_URL=https://rhopenscore.com
diff --git a/openscore-ui/k8s/base/ingress.yaml b/openscore-ui/k8s/base/ingress.yaml
@@ -3,6 +3,8 @@ kind: Ingress
 metadata:
   name: openscore-ui
   namespace: openscore
+  annotations:
+    kubernetes.io/ingress.class:  nginx
 spec:
   ingressClassName: nginx
   rules:

diff --git a/openscore-ui/k8s/overlays/production/ingress-patch.yaml b/openscore-ui/k8s/overlays/production/ingress-patch.yaml
@@ -0,0 +1,12 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: openscore-ui
+  namespace: openscore
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+spec:
+  tls:
+  - hosts:
+    - rhopenscore.com
+    secretName: tls-ui
diff --git a/openscore-ui/k8s/overlays/production/kustomization.yaml b/openscore-ui/k8s/overlays/production/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ../../base
+patchesStrategicMerge:
+- ingress-patch.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		NEXT_PUBLIC_BASE_URL=http://rhopenscore.com
		NEXT_PUBLIC_BASE_URL=https://rhopenscore.com