From 237dd89b5dbd064d60b067ebb38c69c096142a2a Mon Sep 17 00:00:00 2001 From: djh82uk Date: Mon, 17 May 2021 16:04:02 +0100 Subject: [PATCH 01/51] Create exampledeployment.yaml --- exampledeployment.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 exampledeployment.yaml diff --git a/exampledeployment.yaml b/exampledeployment.yaml new file mode 100644 index 00000000..ef8dd36e --- /dev/null +++ b/exampledeployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: user-java + name: user-java + namespace: openhack +spec: + replicas: 2 + selector: + matchLabels: + app: user-java + template: + metadata: + labels: + app: user-java + spec: + containers: + - image: registryrfq6839.azurecr.io/user-java:v1.0 + imagePullPolicy: Always + name: user-java + ports: + - containerPort: 80 + env: + - name: SQL_SERVER + value: "sqlserverrfq6839.database.windows.net" + - name: SQL_DBNAME + value: "mydrivingDB" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: sqlauth + key: username + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: sqlauth + key: password From 17d1f6f6e026e7776383f1e3680ba8e58fd5475f Mon Sep 17 00:00:00 2001 From: djh82uk Date: Mon, 17 May 2021 16:17:24 +0100 Subject: [PATCH 02/51] added deployment --- src/user-java/deployment.yaml | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/user-java/deployment.yaml diff --git a/src/user-java/deployment.yaml b/src/user-java/deployment.yaml new file mode 100644 index 00000000..62b88c1f --- /dev/null +++ b/src/user-java/deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: user-java + name: user-java + namespace: openhack +spec: + replicas: 2 + selector: + matchLabels: + app: user-java + template: + metadata: + labels: + app: user-java + spec: + containers: + - image: registryrfq6839.azurecr.io/user-java:v1.0 + imagePullPolicy: Always + name: user-java + ports: + - containerPort: 80 + env: + - name: SQL_SERVER + value: "sqlserverrfq6839.database.windows.net" + - name: SQL_DBNAME + value: "mydrivingDB" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: sqlauth + key: username + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: sqlauth + key: password \ No newline at end of file From 809ff10e6dee54ec859078d333d7a2835add63a3 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Mon, 17 May 2021 16:17:59 +0100 Subject: [PATCH 03/51] Created deployment.yaml --- src/userprofile/deployment.yaml | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/userprofile/deployment.yaml diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml new file mode 100644 index 00000000..80993ee5 --- /dev/null +++ b/src/userprofile/deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: userprofile + name: userprofile + namespace: openhack +spec: + replicas: 2 + selector: + matchLabels: + app: userprofile + template: + metadata: + labels: + app: userprofile + spec: + containers: + - image: registryrfq6839.azurecr.io/userprofile:v1.0 + imagePullPolicy: Always + name: userprofile + ports: + - containerPort: 80 + env: + - name: SQL_SERVER + value: "sqlserverrfq6839.database.windows.net" + - name: SQL_DBNAME + value: "mydrivingDB" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: sqlauth + key: username + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: sqlauth + key: password From 6ddedf50c98471a30fd692a23c42da22a46145a5 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Mon, 17 May 2021 16:20:30 +0100 Subject: [PATCH 04/51] Added another deployment --- src/tripviewer/deployment.yaml | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/tripviewer/deployment.yaml diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml new file mode 100644 index 00000000..62b88c1f --- /dev/null +++ b/src/tripviewer/deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: user-java + name: user-java + namespace: openhack +spec: + replicas: 2 + selector: + matchLabels: + app: user-java + template: + metadata: + labels: + app: user-java + spec: + containers: + - image: registryrfq6839.azurecr.io/user-java:v1.0 + imagePullPolicy: Always + name: user-java + ports: + - containerPort: 80 + env: + - name: SQL_SERVER + value: "sqlserverrfq6839.database.windows.net" + - name: SQL_DBNAME + value: "mydrivingDB" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: sqlauth + key: username + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: sqlauth + key: password \ No newline at end of file From c0410cdf847ee2fc16b79ee71696d1d7caa7a52f Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Mon, 17 May 2021 16:27:48 +0100 Subject: [PATCH 05/51] Create deployment.yaml --- src/poi/deployment.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/poi/deployment.yaml diff --git a/src/poi/deployment.yaml b/src/poi/deployment.yaml new file mode 100644 index 00000000..2ead2ffd --- /dev/null +++ b/src/poi/deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: poi + name: poi + namespace: openhack +spec: + replicas: 2 + selector: + matchLabels: + app: poi + template: + metadata: + labels: + app: poi + spec: + containers: + - image: registryrfq6839.azurecr.io/poi:v1.0 + imagePullPolicy: Always + name: poi + ports: + - containerPort: 80 + env: + - name: SQL_SERVER + value: "sqlserverrfq6839.database.windows.net" + - name: SQL_DBNAME + value: "mydrivingDB" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: sqlauth + key: username + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: sqlauth + key: password From 59a96a2910993297f1a8b31a9ecdcc144444d7f0 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Mon, 17 May 2021 16:28:48 +0100 Subject: [PATCH 06/51] Create deployment.yaml --- src/trips/deployment.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/trips/deployment.yaml diff --git a/src/trips/deployment.yaml b/src/trips/deployment.yaml new file mode 100644 index 00000000..ef8dd36e --- /dev/null +++ b/src/trips/deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: user-java + name: user-java + namespace: openhack +spec: + replicas: 2 + selector: + matchLabels: + app: user-java + template: + metadata: + labels: + app: user-java + spec: + containers: + - image: registryrfq6839.azurecr.io/user-java:v1.0 + imagePullPolicy: Always + name: user-java + ports: + - containerPort: 80 + env: + - name: SQL_SERVER + value: "sqlserverrfq6839.database.windows.net" + - name: SQL_DBNAME + value: "mydrivingDB" + - name: SQL_USER + valueFrom: + secretKeyRef: + name: sqlauth + key: username + - name: SQL_PASSWORD + valueFrom: + secretKeyRef: + name: sqlauth + key: password From 0025006fec15ef1fbc82345469f98f9cd78994d8 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Mon, 17 May 2021 16:42:09 +0100 Subject: [PATCH 07/51] Update deployment.yaml --- src/trips/deployment.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/trips/deployment.yaml b/src/trips/deployment.yaml index ef8dd36e..e897e343 100644 --- a/src/trips/deployment.yaml +++ b/src/trips/deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: user-java - name: user-java + app: trips + name: trips namespace: openhack spec: replicas: 2 selector: matchLabels: - app: user-java + app: trips template: metadata: labels: - app: user-java + app: trips spec: containers: - - image: registryrfq6839.azurecr.io/user-java:v1.0 + - image: registryrfq6839.azurecr.io/trips:v1.0 imagePullPolicy: Always - name: user-java + name: trips ports: - containerPort: 80 env: From 4c7ac0cf2ca4f16e070f6450300531378007174d Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 10:05:58 +0100 Subject: [PATCH 08/51] Create service.yaml --- src/user-java/service.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/user-java/service.yaml diff --git a/src/user-java/service.yaml b/src/user-java/service.yaml new file mode 100644 index 00000000..ce7d43bf --- /dev/null +++ b/src/user-java/service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: user-java + namespace: openhack + annotations: + service.beta.kubernetes.io/azure-load-balancer-internal: "true" +spec: + type: LoadBalancer + ports: + - port: 80 + selector: + app: user-java From b18263ae32e302fc62cb2965b0e5015520d82cd3 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 10:37:53 +0100 Subject: [PATCH 09/51] Update service.yaml --- src/user-java/service.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/user-java/service.yaml b/src/user-java/service.yaml index ce7d43bf..40d01ed9 100644 --- a/src/user-java/service.yaml +++ b/src/user-java/service.yaml @@ -3,10 +3,7 @@ kind: Service metadata: name: user-java namespace: openhack - annotations: - service.beta.kubernetes.io/azure-load-balancer-internal: "true" spec: - type: LoadBalancer ports: - port: 80 selector: From 6780342edd5313a875c4e8832bcbb737e831919e Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Tue, 18 May 2021 10:41:30 +0100 Subject: [PATCH 10/51] Created service.yaml --- src/userprofile/service.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/userprofile/service.yaml diff --git a/src/userprofile/service.yaml b/src/userprofile/service.yaml new file mode 100644 index 00000000..1971f4a0 --- /dev/null +++ b/src/userprofile/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: userprofile + namespace: openhack +spec: + ports: + - port: 80 + selector: + app: userprofile From d68c89347886bd37b6303987532efb50c55c5910 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Tue, 18 May 2021 10:46:58 +0100 Subject: [PATCH 11/51] Create service.yaml --- src/trips/service.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/trips/service.yaml diff --git a/src/trips/service.yaml b/src/trips/service.yaml new file mode 100644 index 00000000..59b1b2e9 --- /dev/null +++ b/src/trips/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: trips + namespace: openhack +spec: + ports: + - port: 80 + selector: + app: trips From f52536014f281425c43fd7b80248534c298e058f Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Tue, 18 May 2021 10:56:33 +0100 Subject: [PATCH 12/51] poi --- src/poi/service.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/poi/service.yaml diff --git a/src/poi/service.yaml b/src/poi/service.yaml new file mode 100644 index 00000000..e0a27a5a --- /dev/null +++ b/src/poi/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: poi + namespace: openhack +spec: + ports: + - port: 80 + selector: + app: poi From aabcb97c92e382cc07cc625b0b0ac77700ad3d87 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Tue, 18 May 2021 11:23:16 +0100 Subject: [PATCH 13/51] Created service.yaml --- src/tripviewer/service.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/tripviewer/service.yaml diff --git a/src/tripviewer/service.yaml b/src/tripviewer/service.yaml new file mode 100644 index 00000000..f4f1abfa --- /dev/null +++ b/src/tripviewer/service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: tripviewer + namespace: openhack +spec: + type: LoadBalancer + ports: + - port: 80 + selector: + app: tripviewer From 9aee79770c332a48bde469ac1c678f47a4100730 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Tue, 18 May 2021 11:42:39 +0100 Subject: [PATCH 14/51] Updated deployment.yaml --- src/tripviewer/deployment.yaml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml index 62b88c1f..6bd8a553 100644 --- a/src/tripviewer/deployment.yaml +++ b/src/tripviewer/deployment.yaml @@ -1,38 +1,29 @@ apiVersion: apps/v1 kind: Deployment metadata: + name: tripviewer-deployment labels: - app: user-java - name: user-java + app: tripviewer namespace: openhack spec: replicas: 2 selector: matchLabels: - app: user-java + app: tripviewer template: metadata: labels: - app: user-java + app: tripviewer spec: containers: - - image: registryrfq6839.azurecr.io/user-java:v1.0 + - image: registryrfq6839.azurecr.io/tripviewer:v1.0 imagePullPolicy: Always - name: user-java + name: tripviewer + image: tripviewer:v1.0 ports: - containerPort: 80 env: - - name: SQL_SERVER - value: "sqlserverrfq6839.database.windows.net" - - name: SQL_DBNAME - value: "mydrivingDB" - - name: SQL_USER - valueFrom: - secretKeyRef: - name: sqlauth - key: username - - name: SQL_PASSWORD - valueFrom: - secretKeyRef: - name: sqlauth - key: password \ No newline at end of file + - name: TRIPS_API_ENDPOINT + value: "trips.openhack" + - name: USERPROFILE_API_ENDPOINT + value: "userprofile.openhack" From 757adb7a629d1876eafb928ee57ba8c8ecdac8ba Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Tue, 18 May 2021 11:45:43 +0100 Subject: [PATCH 15/51] Update deployment.yaml --- src/tripviewer/deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml index 6bd8a553..32577787 100644 --- a/src/tripviewer/deployment.yaml +++ b/src/tripviewer/deployment.yaml @@ -19,7 +19,6 @@ spec: - image: registryrfq6839.azurecr.io/tripviewer:v1.0 imagePullPolicy: Always name: tripviewer - image: tripviewer:v1.0 ports: - containerPort: 80 env: From aec0feb182f355546b7acd8f0307a0dedda97717 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Tue, 18 May 2021 11:46:54 +0100 Subject: [PATCH 16/51] Update deployment.yaml --- src/tripviewer/deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml index 6bd8a553..32577787 100644 --- a/src/tripviewer/deployment.yaml +++ b/src/tripviewer/deployment.yaml @@ -19,7 +19,6 @@ spec: - image: registryrfq6839.azurecr.io/tripviewer:v1.0 imagePullPolicy: Always name: tripviewer - image: tripviewer:v1.0 ports: - containerPort: 80 env: From 4155fbf8ce596e875758940b6da32c83f38c0138 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 12:57:08 +0100 Subject: [PATCH 17/51] Update deployment.yaml --- src/trips/deployment.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/trips/deployment.yaml b/src/trips/deployment.yaml index e897e343..f8457cf5 100644 --- a/src/trips/deployment.yaml +++ b/src/trips/deployment.yaml @@ -16,7 +16,7 @@ spec: app: trips spec: containers: - - image: registryrfq6839.azurecr.io/trips:v1.0 + - image: registryrfq6839.azurecr.io/trips:chris imagePullPolicy: Always name: trips ports: @@ -36,3 +36,7 @@ spec: secretKeyRef: name: sqlauth key: password + - name: OPENAPI_DOCS_URI + value: "http://localhost" + - name: DEBUG_LOGGING + value: "true" From defe3da679f25d714a29f81155c45cc59683682b Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 13:16:35 +0100 Subject: [PATCH 18/51] Update deployment.yaml --- src/tripviewer/deployment.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml index 32577787..89a98e21 100644 --- a/src/tripviewer/deployment.yaml +++ b/src/tripviewer/deployment.yaml @@ -26,3 +26,8 @@ spec: value: "trips.openhack" - name: USERPROFILE_API_ENDPOINT value: "userprofile.openhack" + - name: ASPNETCORE_ENVIRONMENT + value: "Development" + + + From f7078b8f6723a23610c9642e6f67223213227d31 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 13:17:50 +0100 Subject: [PATCH 19/51] Update deployment.yaml --- src/tripviewer/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml index 89a98e21..02a939ee 100644 --- a/src/tripviewer/deployment.yaml +++ b/src/tripviewer/deployment.yaml @@ -23,9 +23,9 @@ spec: - containerPort: 80 env: - name: TRIPS_API_ENDPOINT - value: "trips.openhack" + value: "http://trips.openhack" - name: USERPROFILE_API_ENDPOINT - value: "userprofile.openhack" + value: "http://userprofile.openhack" - name: ASPNETCORE_ENVIRONMENT value: "Development" From 42b11244684ab84db2bc12a88c76307ee0e6b4ed Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:08:58 +0100 Subject: [PATCH 20/51] Create SecretProvider.yaml --- SecretProvider.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 SecretProvider.yaml diff --git a/SecretProvider.yaml b/SecretProvider.yaml new file mode 100644 index 00000000..f84b6b6a --- /dev/null +++ b/SecretProvider.yaml @@ -0,0 +1,28 @@ +apiVersion: secrets-store.csi.x-k8s.io/v1alpha1 +kind: SecretProviderClass +metadata: + name: azure-kvname + namespace: default +spec: + provider: azure + parameters: + usePodIdentity: "false" + useVMManagedIdentity: "true" + userAssignedIdentityID: "false" + keyvaultName: "aks2-kv" + objects: | + array: + - | + objectName: SQL-DBNAME + objectType: secret + objectVersion: "" + objectName: SQL-FQDN + objectType: secret + objectVersion: "" + objectName: SQL-PASSWORD + objectType: secret + objectVersion: "" + objectName: SQL-USER + objectType: secret + objectVersion: "" + tenantId: "TENANTID" From 5faff64a9bdbe1c6bbd8c948502aaf0de17cdbb6 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:25:44 +0100 Subject: [PATCH 21/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index 80993ee5..aa4c45a1 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -22,17 +22,30 @@ spec: ports: - containerPort: 80 env: - - name: SQL_SERVER - value: "sqlserverrfq6839.database.windows.net" - - name: SQL_DBNAME - value: "mydrivingDB" - name: SQL_USER valueFrom: secretKeyRef: - name: sqlauth - key: username + name: SQL-USER - name: SQL_PASSWORD valueFrom: secretKeyRef: - name: sqlauth - key: password + name: SQL-PASSWORD + - name: SQL_SERVER + valueFrom: + secretKeyRef: + name: SQL-FQDN + - name: SQL_DBNAME + valueFrom: + secretKeyRef: + name: SQL-DBNAME + volumeMounts: + - name: secrets-store-inline + mountPath: "/mnt/secrets-store" + readOnly: true + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" From 7c7abd7cd14c4525546610784cd14a515b9d6044 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:29:29 +0100 Subject: [PATCH 22/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index aa4c45a1..d3600efb 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -21,6 +21,17 @@ spec: name: userprofile ports: - containerPort: 80 + volumeMounts: + - name: secrets-store-inline + mountPath: "/mnt/secrets-store" + readOnly: true + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" env: - name: SQL_USER valueFrom: @@ -38,14 +49,4 @@ spec: valueFrom: secretKeyRef: name: SQL-DBNAME - volumeMounts: - - name: secrets-store-inline - mountPath: "/mnt/secrets-store" - readOnly: true - volumes: - - name: secrets-store-inline - csi: - driver: secrets-store.csi.k8s.io - readOnly: true - volumeAttributes: - secretProviderClass: "azure-kvname" + From 8945070df9e964d344cbfe1c71b58d003c628ead Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:29:54 +0100 Subject: [PATCH 23/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index d3600efb..063ec981 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -23,8 +23,8 @@ spec: - containerPort: 80 volumeMounts: - name: secrets-store-inline - mountPath: "/mnt/secrets-store" - readOnly: true + mountPath: "/mnt/secrets-store" + readOnly: true volumes: - name: secrets-store-inline csi: From fbc21cb181087d301ade1120b7b3235dc8c90f0a Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:30:41 +0100 Subject: [PATCH 24/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index 063ec981..221aeaf1 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -25,13 +25,6 @@ spec: - name: secrets-store-inline mountPath: "/mnt/secrets-store" readOnly: true - volumes: - - name: secrets-store-inline - csi: - driver: secrets-store.csi.k8s.io - readOnly: true - volumeAttributes: - secretProviderClass: "azure-kvname" env: - name: SQL_USER valueFrom: @@ -49,4 +42,12 @@ spec: valueFrom: secretKeyRef: name: SQL-DBNAME + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" + From df932b55881068c2ae3a8a5b817b010ce1dcd593 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:41:18 +0100 Subject: [PATCH 25/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index 221aeaf1..697f1e49 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: userprofile name: userprofile - namespace: openhack + namespace: api spec: replicas: 2 selector: From e38c745c10200f5530e0c7708f5069328b40f3b5 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 15:45:33 +0100 Subject: [PATCH 26/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index 697f1e49..2fa844e4 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -23,25 +23,8 @@ spec: - containerPort: 80 volumeMounts: - name: secrets-store-inline - mountPath: "/mnt/secrets-store" + mountPath: "/secrets" readOnly: true - env: - - name: SQL_USER - valueFrom: - secretKeyRef: - name: SQL-USER - - name: SQL_PASSWORD - valueFrom: - secretKeyRef: - name: SQL-PASSWORD - - name: SQL_SERVER - valueFrom: - secretKeyRef: - name: SQL-FQDN - - name: SQL_DBNAME - valueFrom: - secretKeyRef: - name: SQL-DBNAME volumes: - name: secrets-store-inline csi: From b23613a836e54440f04a406646d4bc97bd29e7ad Mon Sep 17 00:00:00 2001 From: djh82uk Date: Tue, 18 May 2021 17:55:59 +0100 Subject: [PATCH 27/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index 2fa844e4..5ddabc4b 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -27,10 +27,22 @@ spec: readOnly: true volumes: - name: secrets-store-inline + secret: + secretName: "secrets-store-inline" + items: + - key: "SQL-DBNAME" + path: "SQL_DBNAME" + - key: "SQL-FQDN" + path: "SQL_SERVER" + - key: "SQL-PASSWORD" + path: "SQL_PASSWORD" + - key: "SQL-USER" + path: "SQL_USER " csi: driver: secrets-store.csi.k8s.io readOnly: true volumeAttributes: secretProviderClass: "azure-kvname" - + + From db5b001db8c13e6f421ff0623c782c0301fc51af Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 09:29:58 +0100 Subject: [PATCH 28/51] Update deployment.yaml --- src/userprofile/deployment.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/userprofile/deployment.yaml b/src/userprofile/deployment.yaml index 5ddabc4b..2b6baad5 100644 --- a/src/userprofile/deployment.yaml +++ b/src/userprofile/deployment.yaml @@ -27,17 +27,6 @@ spec: readOnly: true volumes: - name: secrets-store-inline - secret: - secretName: "secrets-store-inline" - items: - - key: "SQL-DBNAME" - path: "SQL_DBNAME" - - key: "SQL-FQDN" - path: "SQL_SERVER" - - key: "SQL-PASSWORD" - path: "SQL_PASSWORD" - - key: "SQL-USER" - path: "SQL_USER " csi: driver: secrets-store.csi.k8s.io readOnly: true From b98e47ba71fc1cc365aa561241f43b3e73066e30 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 09:39:58 +0100 Subject: [PATCH 29/51] Update SecretProvider.yaml --- SecretProvider.yaml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/SecretProvider.yaml b/SecretProvider.yaml index f84b6b6a..0f52e177 100644 --- a/SecretProvider.yaml +++ b/SecretProvider.yaml @@ -2,27 +2,34 @@ apiVersion: secrets-store.csi.x-k8s.io/v1alpha1 kind: SecretProviderClass metadata: name: azure-kvname - namespace: default + namespace: api spec: provider: azure parameters: usePodIdentity: "false" useVMManagedIdentity: "true" - userAssignedIdentityID: "false" + userAssignedIdentityID: "4293cc82-3323-41cb-bf31-9f4c7372238a" keyvaultName: "aks2-kv" objects: | array: - | - objectName: SQL-DBNAME + objectName: SQL-DBNAME + objectAlias: SQL_DBNAME objectType: secret objectVersion: "" - objectName: SQL-FQDN + - | + objectName: SQL-FQDN + objectAlias: SQL_SERVER objectType: secret objectVersion: "" - objectName: SQL-PASSWORD + - | + objectName: SQL-PASSWORD + objectAlias: SQL_PASSWORD objectType: secret objectVersion: "" - objectName: SQL-USER + - | + objectName: SQL-USER + objectAlias: SQL_USER objectType: secret objectVersion: "" - tenantId: "TENANTID" + tenantId: "TENANT" From 1d3e5c8be47287a3f8f81432a706b5811cd18737 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Wed, 19 May 2021 09:45:45 +0100 Subject: [PATCH 30/51] Update deployment.yaml --- src/trips/deployment.yaml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/trips/deployment.yaml b/src/trips/deployment.yaml index f8457cf5..c65468e9 100644 --- a/src/trips/deployment.yaml +++ b/src/trips/deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: trips name: trips - namespace: openhack + namespace: api spec: replicas: 2 selector: @@ -21,22 +21,14 @@ spec: name: trips ports: - containerPort: 80 - env: - - name: SQL_SERVER - value: "sqlserverrfq6839.database.windows.net" - - name: SQL_DBNAME - value: "mydrivingDB" - - name: SQL_USER - valueFrom: - secretKeyRef: - name: sqlauth - key: username - - name: SQL_PASSWORD - valueFrom: - secretKeyRef: - name: sqlauth - key: password - - name: OPENAPI_DOCS_URI - value: "http://localhost" - - name: DEBUG_LOGGING - value: "true" + volumeMounts: + - name: secrets-store-inline + mountPath: "/secrets" + readOnly: true + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" From 64d190db164ad951d0eec1965294a35c038b758d Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Wed, 19 May 2021 09:46:14 +0100 Subject: [PATCH 31/51] adding secrets --- src/poi/deployment.yaml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/poi/deployment.yaml b/src/poi/deployment.yaml index 2ead2ffd..a3b3964d 100644 --- a/src/poi/deployment.yaml +++ b/src/poi/deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: poi name: poi - namespace: openhack + namespace: api spec: replicas: 2 selector: @@ -21,18 +21,14 @@ spec: name: poi ports: - containerPort: 80 - env: - - name: SQL_SERVER - value: "sqlserverrfq6839.database.windows.net" - - name: SQL_DBNAME - value: "mydrivingDB" - - name: SQL_USER - valueFrom: - secretKeyRef: - name: sqlauth - key: username - - name: SQL_PASSWORD - valueFrom: - secretKeyRef: - name: sqlauth - key: password + volumeMounts: + - name: secrets-store-inline + mountPath: "/secrets" + readOnly: true + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" \ No newline at end of file From aea45bf5b54ea266f76ddc90999062941526e225 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Wed, 19 May 2021 09:48:35 +0100 Subject: [PATCH 32/51] Update deployment.yaml --- src/user-java/deployment.yaml | 38 ++++++++++++++++------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/user-java/deployment.yaml b/src/user-java/deployment.yaml index 62b88c1f..b02f8e60 100644 --- a/src/user-java/deployment.yaml +++ b/src/user-java/deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: user-java name: user-java - namespace: openhack + namespace: api spec: replicas: 2 selector: @@ -16,23 +16,19 @@ spec: app: user-java spec: containers: - - image: registryrfq6839.azurecr.io/user-java:v1.0 - imagePullPolicy: Always - name: user-java - ports: - - containerPort: 80 - env: - - name: SQL_SERVER - value: "sqlserverrfq6839.database.windows.net" - - name: SQL_DBNAME - value: "mydrivingDB" - - name: SQL_USER - valueFrom: - secretKeyRef: - name: sqlauth - key: username - - name: SQL_PASSWORD - valueFrom: - secretKeyRef: - name: sqlauth - key: password \ No newline at end of file + - image: registryrfq6839.azurecr.io/user-java:v1.0 + imagePullPolicy: Always + name: user-java + ports: + - containerPort: 80 + volumeMounts: + - name: secrets-store-inline + mountPath: "/secrets" + readOnly: true + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" From a49910468e702385ac5a9b66bcbc280650493663 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Wed, 19 May 2021 09:57:00 +0100 Subject: [PATCH 33/51] Update deployment.yaml --- src/trips/deployment.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/trips/deployment.yaml b/src/trips/deployment.yaml index c65468e9..99c317ca 100644 --- a/src/trips/deployment.yaml +++ b/src/trips/deployment.yaml @@ -25,10 +25,10 @@ spec: - name: secrets-store-inline mountPath: "/secrets" readOnly: true - volumes: - - name: secrets-store-inline - csi: - driver: secrets-store.csi.k8s.io - readOnly: true - volumeAttributes: - secretProviderClass: "azure-kvname" + volumes: + - name: secrets-store-inline + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "azure-kvname" From 2dd93c3ddcefee777845a777056adcfeb60516b7 Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Wed, 19 May 2021 10:01:18 +0100 Subject: [PATCH 34/51] format yaml --- src/poi/deployment.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/poi/deployment.yaml b/src/poi/deployment.yaml index a3b3964d..fe389f8a 100644 --- a/src/poi/deployment.yaml +++ b/src/poi/deployment.yaml @@ -21,14 +21,14 @@ spec: name: poi ports: - containerPort: 80 - volumeMounts: - - name: secrets-store-inline - mountPath: "/secrets" - readOnly: true + volumeMounts: + - name: secrets-store-inline + mountPath: "/secrets" + readOnly: true volumes: - name: secrets-store-inline csi: driver: secrets-store.csi.k8s.io readOnly: true volumeAttributes: - secretProviderClass: "azure-kvname" \ No newline at end of file + secretProviderClass: "azure-kvname" From 52a29f11ac2d4ffc35c46dc08451f89bbdaca15c Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 10:39:21 +0100 Subject: [PATCH 35/51] Update service.yaml --- src/userprofile/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/userprofile/service.yaml b/src/userprofile/service.yaml index 1971f4a0..96741c39 100644 --- a/src/userprofile/service.yaml +++ b/src/userprofile/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: userprofile - namespace: openhack + namespace: api spec: ports: - port: 80 From 9ab7b31e790a7b045f0fbbc108ce3d999810546c Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Wed, 19 May 2021 10:39:50 +0100 Subject: [PATCH 36/51] updated namespace --- src/poi/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/poi/service.yaml b/src/poi/service.yaml index e0a27a5a..908ecb57 100644 --- a/src/poi/service.yaml +++ b/src/poi/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: poi - namespace: openhack + namespace: api spec: ports: - port: 80 From 144d600908e654fef1dba11df009c27c3696e857 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Wed, 19 May 2021 10:40:04 +0100 Subject: [PATCH 37/51] Update service.yaml --- src/trips/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trips/service.yaml b/src/trips/service.yaml index 59b1b2e9..7768849c 100644 --- a/src/trips/service.yaml +++ b/src/trips/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: trips - namespace: openhack + namespace: api spec: ports: - port: 80 From 3dae4dec387943f690c54684c4ee6c7d24653661 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Wed, 19 May 2021 10:40:05 +0100 Subject: [PATCH 38/51] Update service.yaml --- src/user-java/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user-java/service.yaml b/src/user-java/service.yaml index 40d01ed9..8da17dbb 100644 --- a/src/user-java/service.yaml +++ b/src/user-java/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: user-java - namespace: openhack + namespace: api spec: ports: - port: 80 From 3fed94787fea094458d9cdaa0ba88e19f1d3bec6 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Wed, 19 May 2021 10:41:55 +0100 Subject: [PATCH 39/51] Create service.yaml --- src/user-java/service.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/user-java/service.yaml diff --git a/src/user-java/service.yaml b/src/user-java/service.yaml new file mode 100644 index 00000000..8da17dbb --- /dev/null +++ b/src/user-java/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: user-java + namespace: api +spec: + ports: + - port: 80 + selector: + app: user-java From dff7e5ebbe04a9cc79853f2c542fef9ecd86ae69 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Wed, 19 May 2021 10:46:24 +0100 Subject: [PATCH 40/51] Update service.yaml --- src/tripviewer/service.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tripviewer/service.yaml b/src/tripviewer/service.yaml index f4f1abfa..23ec815b 100644 --- a/src/tripviewer/service.yaml +++ b/src/tripviewer/service.yaml @@ -2,10 +2,9 @@ apiVersion: v1 kind: Service metadata: name: tripviewer - namespace: openhack + namespace: web spec: - type: LoadBalancer ports: - - port: 80 + - port: 80 selector: app: tripviewer From ed5da0aa952989889584279eb38c15247dd31206 Mon Sep 17 00:00:00 2001 From: pvghms <84317236+pvghms@users.noreply.github.com> Date: Wed, 19 May 2021 10:47:34 +0100 Subject: [PATCH 41/51] Update deployment.yaml --- src/tripviewer/deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tripviewer/deployment.yaml b/src/tripviewer/deployment.yaml index 02a939ee..be4af2cb 100644 --- a/src/tripviewer/deployment.yaml +++ b/src/tripviewer/deployment.yaml @@ -4,7 +4,7 @@ metadata: name: tripviewer-deployment labels: app: tripviewer - namespace: openhack + namespace: web spec: replicas: 2 selector: @@ -23,9 +23,9 @@ spec: - containerPort: 80 env: - name: TRIPS_API_ENDPOINT - value: "http://trips.openhack" + value: "http://trips.api" - name: USERPROFILE_API_ENDPOINT - value: "http://userprofile.openhack" + value: "http://userprofile.api" - name: ASPNETCORE_ENVIRONMENT value: "Development" From 5c49da3bdb357eb14a145b2de26570766ffbea9a Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Wed, 19 May 2021 11:20:59 +0100 Subject: [PATCH 42/51] ingress yaml --- ingress.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 ingress.yml diff --git a/ingress.yml b/ingress.yml new file mode 100644 index 00000000..7a6cebf8 --- /dev/null +++ b/ingress.yml @@ -0,0 +1,49 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: nginx-ingress + namespace: ingress-basic + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$1 +spec: + rules: + - http: + paths: + - path: /api/poi(/|$)(.*) + pathType: Prefix + backend: + service: + name: poi + port: + number: 80 + - path: /api/trips(/|$)(.*) + pathType: Prefix + backend: + service: + name: trips + port: + number: 80 + - path: /api/user(/|$)(.*) + pathType: Prefix + backend: + service: + name: userprofile + port: + number: 80 + - path: /api/user-java(/|$)(.*) + pathType: Prefix + backend: + service: + name: user-java + port: + number: 80 + - path: /(.*) + pathType: Prefix + backend: + service: + name: tripviewer + port: + number: 80 From 0c6459f3e7116fc51d0b06d004b6b329fa23d2c9 Mon Sep 17 00:00:00 2001 From: thedevopscat <51438359+thedevopscat@users.noreply.github.com> Date: Wed, 19 May 2021 11:43:37 +0100 Subject: [PATCH 43/51] updated ingress --- ingress.yml => ingress-api.yml | 10 +--------- ingress-web.yml | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) rename ingress.yml => ingress-api.yml (80%) create mode 100644 ingress-web.yml diff --git a/ingress.yml b/ingress-api.yml similarity index 80% rename from ingress.yml rename to ingress-api.yml index 7a6cebf8..f6e973bd 100644 --- a/ingress.yml +++ b/ingress-api.yml @@ -2,12 +2,11 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: nginx-ingress - namespace: ingress-basic + namespace: api annotations: kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/ssl-redirect: "false" nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: /$1 spec: rules: - http: @@ -40,10 +39,3 @@ spec: name: user-java port: number: 80 - - path: /(.*) - pathType: Prefix - backend: - service: - name: tripviewer - port: - number: 80 diff --git a/ingress-web.yml b/ingress-web.yml new file mode 100644 index 00000000..3ec949d1 --- /dev/null +++ b/ingress-web.yml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: web-ingress + namespace: web + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$1 +spec: + rules: + - http: + paths: + - path: /(.*) + pathType: Prefix + backend: + service: + name: tripviewer + port: + number: 80 From 9ce0b0cd21351e7cab1479a8cf9a490c82225019 Mon Sep 17 00:00:00 2001 From: Darren Johnson <33925656+darren-johnson@users.noreply.github.com> Date: Wed, 19 May 2021 13:25:03 +0100 Subject: [PATCH 44/51] Create insurance.yaml --- src/insurance.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/insurance.yaml diff --git a/src/insurance.yaml b/src/insurance.yaml new file mode 100644 index 00000000..bb4cd820 --- /dev/null +++ b/src/insurance.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: insurance-deployment + labels: + deploy: insurance +spec: + replicas: 2 + selector: + matchLabels: + app: insurance + template: + metadata: + labels: + app: insurance + spec: + containers: + - image: "registryrfq6839.azurecr.io/insurance:1.0" + imagePullPolicy: Always + name: insurance + ports: + - containerPort: 8081 + name: http + protocol: TCP +--- +apiVersion: v1 +kind: Service +metadata: + name: insurance +spec: + type: ClusterIP + selector: + app: insurance + ports: + - protocol: TCP + name: insurance-http + port: 80 + targetPort: 8081 From 21bfa5533489f0d219ccece17cf95fd0723a2da1 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 14:22:23 +0100 Subject: [PATCH 45/51] Update insurance.yaml --- src/insurance.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/insurance.yaml b/src/insurance.yaml index bb4cd820..b88674bc 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -16,6 +16,13 @@ spec: spec: containers: - image: "registryrfq6839.azurecr.io/insurance:1.0" + resources: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "256Mi" + cpu: "200m" imagePullPolicy: Always name: insurance ports: From 376129f899731c2c85271de1bd24cda8b461fcb9 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 14:32:38 +0100 Subject: [PATCH 46/51] Update insurance.yaml --- src/insurance.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insurance.yaml b/src/insurance.yaml index b88674bc..d67d8468 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -18,10 +18,10 @@ spec: - image: "registryrfq6839.azurecr.io/insurance:1.0" resources: requests: - memory: "128Mi" + memory: "512Mi" cpu: "100m" limits: - memory: "256Mi" + memory: "1024Mi" cpu: "200m" imagePullPolicy: Always name: insurance From f4d493ec3b011508fe50f48ec189e613d8824663 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 14:35:20 +0100 Subject: [PATCH 47/51] Update insurance.yaml --- src/insurance.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/insurance.yaml b/src/insurance.yaml index d67d8468..131bc2f8 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -5,7 +5,7 @@ metadata: labels: deploy: insurance spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: insurance @@ -21,7 +21,7 @@ spec: memory: "512Mi" cpu: "100m" limits: - memory: "1024Mi" + memory: "3Gi" cpu: "200m" imagePullPolicy: Always name: insurance From 855853776fd7082aefcb2e929323de756d40d38d Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 15:02:49 +0100 Subject: [PATCH 48/51] Update insurance.yaml --- src/insurance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/insurance.yaml b/src/insurance.yaml index 131bc2f8..ee286557 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -22,7 +22,7 @@ spec: cpu: "100m" limits: memory: "3Gi" - cpu: "200m" + cpu: "1" imagePullPolicy: Always name: insurance ports: From 3baebf76e722c1ede60f91835509bdc7424a8436 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 15:23:49 +0100 Subject: [PATCH 49/51] Update insurance.yaml --- src/insurance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/insurance.yaml b/src/insurance.yaml index ee286557..a3f03f78 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -22,7 +22,7 @@ spec: cpu: "100m" limits: memory: "3Gi" - cpu: "1" + cpu: "1800m" imagePullPolicy: Always name: insurance ports: From de19466b5013eb031b6d294b24b29a1c900a3a97 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 15:24:10 +0100 Subject: [PATCH 50/51] Update insurance.yaml --- src/insurance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/insurance.yaml b/src/insurance.yaml index a3f03f78..4b197539 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -21,7 +21,7 @@ spec: memory: "512Mi" cpu: "100m" limits: - memory: "3Gi" + memory: "2.8Gi" cpu: "1800m" imagePullPolicy: Always name: insurance From 57ae85afdbd73806c059b5e704dabbbb09821853 Mon Sep 17 00:00:00 2001 From: djh82uk Date: Wed, 19 May 2021 15:36:17 +0100 Subject: [PATCH 51/51] Update insurance.yaml --- src/insurance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/insurance.yaml b/src/insurance.yaml index 4b197539..596ddaf7 100644 --- a/src/insurance.yaml +++ b/src/insurance.yaml @@ -21,7 +21,7 @@ spec: memory: "512Mi" cpu: "100m" limits: - memory: "2.8Gi" + memory: "6.5Gi" cpu: "1800m" imagePullPolicy: Always name: insurance