From ecd7121989a798fbec8feea72da3f376e7a099a0 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 13:54:16 +0000 Subject: [PATCH 01/12] PAF-100 Update deploy.sh --- bin/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/deploy.sh b/bin/deploy.sh index b688d868..763e4197 100644 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -33,6 +33,7 @@ if [[ ${KUBE_NAMESPACE} == ${BRANCH_ENV} ]]; then $kd -f kube/file-vault elif [[ ${KUBE_NAMESPACE} == ${UAT_ENV} ]]; then $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml + $kd -f kube/certs $kd -f kube/app/networkpolicy-internal.yml -f kube/app/ingress-internal.yml $kd -f kube/app/networkpolicy-external.yml -f kube/app/ingress-external.yml $kd -f kube/redis -f kube/app/deployment.yml From 7ac17f11368ab464d8f41b1aa19da8d067571c19 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 14:06:25 +0000 Subject: [PATCH 02/12] PAF-100 Update deploy.sh --- .drone.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 06680cdc..77b4d106 100644 --- a/.drone.yml +++ b/.drone.yml @@ -254,8 +254,11 @@ steps: commands: - sh bin/deploy.sh $${UAT_ENV} when: - branch: master - event: push + branch: + include: + - master + - feature/* + event: pull_request # Get pull request branch so correct PR UAT environment is torn down in the tear_down_branch step that follows. - name: get_pr_branch From a32045f1643796c596eaf7106b9110a97a22c417 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 14:12:10 +0000 Subject: [PATCH 03/12] PAF-100 Update deploy.sh --- .drone.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 77b4d106..a9e8c8be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -183,6 +183,24 @@ steps: - feature/* event: pull_request + # Deploy to master UAT environment + - name: deploy_to_uat + pull: if-not-exists + image: quay.io/ukhomeofficedigital/kd:v1.14.0 + environment: + KUBE_SERVER: + from_secret: kube_server_dev + KUBE_TOKEN: + from_secret: kube_token_dev + commands: + - sh bin/deploy.sh $${UAT_ENV} + when: + branch: + include: + - master + - feature/* + event: pull_request + - name: unit_tests_branch <<: *unit_tests when: @@ -242,24 +260,6 @@ steps: - feature/* event: pull_request - # Deploy to master UAT environment - - name: deploy_to_uat - pull: if-not-exists - image: quay.io/ukhomeofficedigital/kd:v1.14.0 - environment: - KUBE_SERVER: - from_secret: kube_server_dev - KUBE_TOKEN: - from_secret: kube_token_dev - commands: - - sh bin/deploy.sh $${UAT_ENV} - when: - branch: - include: - - master - - feature/* - event: pull_request - # Get pull request branch so correct PR UAT environment is torn down in the tear_down_branch step that follows. - name: get_pr_branch pull: if-not-exists From feff1e2e7de6d843ad4c1c340c66176cba9e6e4c Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 16:03:05 +0000 Subject: [PATCH 04/12] PAF-100 Update deploy.sh --- bin/deploy.sh | 1 - kube/file-vault/file-vault-deployment.yml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/deploy.sh b/bin/deploy.sh index 763e4197..b688d868 100644 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -33,7 +33,6 @@ if [[ ${KUBE_NAMESPACE} == ${BRANCH_ENV} ]]; then $kd -f kube/file-vault elif [[ ${KUBE_NAMESPACE} == ${UAT_ENV} ]]; then $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml - $kd -f kube/certs $kd -f kube/app/networkpolicy-internal.yml -f kube/app/ingress-internal.yml $kd -f kube/app/networkpolicy-external.yml -f kube/app/ingress-external.yml $kd -f kube/redis -f kube/app/deployment.yml diff --git a/kube/file-vault/file-vault-deployment.yml b/kube/file-vault/file-vault-deployment.yml index 852bda45..f84edf17 100644 --- a/kube/file-vault/file-vault-deployment.yml +++ b/kube/file-vault/file-vault-deployment.yml @@ -54,11 +54,11 @@ spec: value: "0" - name: FILE_VAULT_URL {{ if eq .KUBE_NAMESPACE .PROD_ENV }} - value: https://supp-docs.prod.{{ .APP_NAME }}.homeoffice.gov.uk + value: https://fv.prod.{{ .APP_NAME }}.homeoffice.gov.uk {{ else if eq .KUBE_NAMESPACE .STG_ENV }} - value: https://supp-docs-dev.notprod.{{ .APP_NAME }}.homeoffice.gov.uk + value: https://fv-stg.prod.{{ .APP_NAME }}.homeoffice.gov.uk {{ else if eq .KUBE_NAMESPACE .UAT_ENV }} - value: https://supp-docs-dev.notprod.{{ .APP_NAME }}.homeoffice.gov.uk + value: https://fv-uat.notprod.{{ .APP_NAME }}.homeoffice.gov.uk {{ else if eq .KUBE_NAMESPACE .BRANCH_ENV }} value: https://fv-{{ .DRONE_SOURCE_BRANCH }}.{{ .BRANCH_ENV }}.homeoffice.gov.uk - name: DEBUG From 81994a6e7b07caeda20e95ab76a64e94a9a83a13 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 16:21:15 +0000 Subject: [PATCH 05/12] PAF-100 Update deploy.sh --- bin/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/deploy.sh b/bin/deploy.sh index b688d868..763e4197 100644 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -33,6 +33,7 @@ if [[ ${KUBE_NAMESPACE} == ${BRANCH_ENV} ]]; then $kd -f kube/file-vault elif [[ ${KUBE_NAMESPACE} == ${UAT_ENV} ]]; then $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml + $kd -f kube/certs $kd -f kube/app/networkpolicy-internal.yml -f kube/app/ingress-internal.yml $kd -f kube/app/networkpolicy-external.yml -f kube/app/ingress-external.yml $kd -f kube/redis -f kube/app/deployment.yml From 1860daad6a8a86481bed13c47d9fa202eb0e1dbe Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 16:41:26 +0000 Subject: [PATCH 06/12] PAF-100 Update deploy.sh --- bin/deploy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/deploy.sh b/bin/deploy.sh index 763e4197..d7fca9d3 100644 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -33,10 +33,9 @@ if [[ ${KUBE_NAMESPACE} == ${BRANCH_ENV} ]]; then $kd -f kube/file-vault elif [[ ${KUBE_NAMESPACE} == ${UAT_ENV} ]]; then $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml - $kd -f kube/certs $kd -f kube/app/networkpolicy-internal.yml -f kube/app/ingress-internal.yml $kd -f kube/app/networkpolicy-external.yml -f kube/app/ingress-external.yml - $kd -f kube/redis -f kube/app/deployment.yml + $kd -f kube/redis -f kube/file-vault -f kube/app/deployment.yml $kd -f kube/ims-resolver elif [[ ${KUBE_NAMESPACE} == ${STG_ENV} ]]; then $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml From 0e5a3a9759fe36ebbf8159d4f97880f1c1dc5fb2 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Thu, 16 Nov 2023 16:50:55 +0000 Subject: [PATCH 07/12] PAF-100 Update deploy.sh --- bin/deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/deploy.sh b/bin/deploy.sh index d7fca9d3..0f2c0627 100644 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -32,7 +32,9 @@ if [[ ${KUBE_NAMESPACE} == ${BRANCH_ENV} ]]; then $kd -f kube/ims-resolver $kd -f kube/file-vault elif [[ ${KUBE_NAMESPACE} == ${UAT_ENV} ]]; then + $kd -f kube/file-vault/file-vault-ingress.yml $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml + $kd -f kube/certs $kd -f kube/app/networkpolicy-internal.yml -f kube/app/ingress-internal.yml $kd -f kube/app/networkpolicy-external.yml -f kube/app/ingress-external.yml $kd -f kube/redis -f kube/file-vault -f kube/app/deployment.yml From b0f429828ec3c20095423a9404cd1c58d47934e9 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Fri, 17 Nov 2023 10:44:54 +0000 Subject: [PATCH 08/12] PAF-100 Update deploy.sh --- bin/deploy.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/deploy.sh b/bin/deploy.sh index 0f2c0627..bfe11e45 100644 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -45,9 +45,11 @@ elif [[ ${KUBE_NAMESPACE} == ${STG_ENV} ]]; then $kd -f kube/redis -f kube/app/deployment.yml $kd -f kube/ims-resolver elif [[ ${KUBE_NAMESPACE} == ${PROD_ENV} ]]; then + $kd -f kube/file-vault/file-vault-ingress.yml $kd -f kube/configmaps/configmap.yml -f kube/app/service.yml + $kd -f kube/certs $kd -f kube/app/networkpolicy-external.yml -f kube/app/ingress-external.yml - $kd -f kube/redis -f kube/app/deployment.yml + $kd -f kube/redis -f kube/file-vault -f kube/app/deployment.yml $kd -f kube/ims-resolver fi From 62216cb8214b44507e5abd943f411f96e679a1af Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Fri, 17 Nov 2023 10:52:28 +0000 Subject: [PATCH 09/12] PAF-100 Update deploy.sh --- .drone.yml | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index a9e8c8be..0e65c94e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -183,24 +183,6 @@ steps: - feature/* event: pull_request - # Deploy to master UAT environment - - name: deploy_to_uat - pull: if-not-exists - image: quay.io/ukhomeofficedigital/kd:v1.14.0 - environment: - KUBE_SERVER: - from_secret: kube_server_dev - KUBE_TOKEN: - from_secret: kube_token_dev - commands: - - sh bin/deploy.sh $${UAT_ENV} - when: - branch: - include: - - master - - feature/* - event: pull_request - - name: unit_tests_branch <<: *unit_tests when: @@ -259,6 +241,21 @@ steps: - master - feature/* event: pull_request + + # Deploy to master UAT environment + - name: deploy_to_uat + pull: if-not-exists + image: quay.io/ukhomeofficedigital/kd:v1.14.0 + environment: + KUBE_SERVER: + from_secret: kube_server_dev + KUBE_TOKEN: + from_secret: kube_token_dev + commands: + - sh bin/deploy.sh $${UAT_ENV} + when: + branch: master + event: push # Get pull request branch so correct PR UAT environment is torn down in the tear_down_branch step that follows. - name: get_pr_branch From 47eeca77c2b8047b61f4d159ce55b15897a4c87e Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Fri, 17 Nov 2023 10:55:06 +0000 Subject: [PATCH 10/12] PAF-100 Update deploy.sh --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0e65c94e..d40ed62f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -241,7 +241,6 @@ steps: - master - feature/* event: pull_request - # Deploy to master UAT environment - name: deploy_to_uat pull: if-not-exists From 73349beddf128298daacce441c2d61b2459a6bf2 Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Fri, 17 Nov 2023 10:55:48 +0000 Subject: [PATCH 11/12] PAF-100 Update deploy.sh --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index d40ed62f..e92ade74 100644 --- a/.drone.yml +++ b/.drone.yml @@ -241,6 +241,7 @@ steps: - master - feature/* event: pull_request + # Deploy to master UAT environment - name: deploy_to_uat pull: if-not-exists From 70ead49b840b5af7e27ead6eb0e69fc4a72d8c0d Mon Sep 17 00:00:00 2001 From: SavantDhindsaHO Date: Fri, 17 Nov 2023 11:05:41 +0000 Subject: [PATCH 12/12] PAF-100 Update deploy.sh 1.Updated deploy.sh and file-vault-deployment.yml files with details related to file-vault and cert. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e92ade74..06680cdc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -241,7 +241,7 @@ steps: - master - feature/* event: pull_request - + # Deploy to master UAT environment - name: deploy_to_uat pull: if-not-exists