From 69cd5a10df91c54597858a8d518ed7920f53634a Mon Sep 17 00:00:00 2001 From: tschneid Date: Sun, 2 Mar 2025 20:59:41 -0600 Subject: [PATCH] fix schema / variable mapping --- config/config.msft.yaml | 1 + config/config.schema.json | 10 ++++++---- config/config.yaml | 1 + config/public-cloud-cs-pr.json | 1 + config/public-cloud-dev.json | 1 + config/public-cloud-msft-int.json | 1 + config/public-cloud-personal-dev.json | 1 + frontend/Makefile | 5 +++-- .../charts/mise/templates/deployment.yaml | 6 +++--- .../charts/mise/templates/service.yaml | 2 +- .../helm/frontend/charts/mise/values.yaml | 19 +++++++++---------- frontend/pipeline.yaml | 6 ++++-- 12 files changed, 32 insertions(+), 22 deletions(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index ecd145429..dc24f20d4 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -94,6 +94,7 @@ defaults: mise: deploy: true azureAdInstance: https://login.microsoftonline.com/ + azureAdClientId: "" armInstance: https://management.core.windows.net/ validAppId0: "" validAppId1: "" diff --git a/config/config.schema.json b/config/config.schema.json index e481e7f2f..96d28bcac 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -469,13 +469,14 @@ "azureAdInstance":{ "type":"string" }, + "azureAdClientId":{ + "type":"string" + }, "validAppId0":{ - "type":"string", - "description": "" + "type":"string" }, "validAppId1":{ - "type":"string", - "description": "" + "type":"string" }, "image":{ "$ref": "#/definitions/containerImage" @@ -485,6 +486,7 @@ "deploy", "image", "azureAdInstance", + "azureAdClientId", "validAppId0", "validAppId1" ] diff --git a/config/config.yaml b/config/config.yaml index 0b711da1f..c56ee08b1 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -93,6 +93,7 @@ defaults: mise: deploy: false azureAdInstance: "" + azureAdClientId: "" armInstance: "" validAppId0: "" validAppId1: "" diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json index c91c69ce8..badcccd50 100644 --- a/config/public-cloud-cs-pr.json +++ b/config/public-cloud-cs-pr.json @@ -247,6 +247,7 @@ "miMockPrincipalId": "d6b62dfa-87f5-49b3-bbcb-4a687c4faa96", "mise": { "armInstance": "", + "azureAdClientId": "", "azureAdInstance": "", "deploy": false, "image": { diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json index c171a7a9e..824566dfd 100644 --- a/config/public-cloud-dev.json +++ b/config/public-cloud-dev.json @@ -247,6 +247,7 @@ "miMockPrincipalId": "d6b62dfa-87f5-49b3-bbcb-4a687c4faa96", "mise": { "armInstance": "", + "azureAdClientId": "", "azureAdInstance": "", "deploy": false, "image": { diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json index 08585df26..a964e5055 100644 --- a/config/public-cloud-msft-int.json +++ b/config/public-cloud-msft-int.json @@ -254,6 +254,7 @@ "miMockPrincipalId": "d6b62dfa-87f5-49b3-bbcb-4a687c4faa96", "mise": { "armInstance": "https://management.core.windows.net/", + "azureAdClientId": "", "azureAdInstance": "https://login.microsoftonline.com/", "deploy": true, "image": { diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json index e725c8673..a48d2060e 100644 --- a/config/public-cloud-personal-dev.json +++ b/config/public-cloud-personal-dev.json @@ -247,6 +247,7 @@ "miMockPrincipalId": "d6b62dfa-87f5-49b3-bbcb-4a687c4faa96", "mise": { "armInstance": "", + "azureAdClientId": "", "azureAdInstance": "", "deploy": false, "image": { diff --git a/frontend/Makefile b/frontend/Makefile index 2a70b3909..47f6f70ec 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -92,8 +92,9 @@ deploy: --set mise.imageRegistry=${MISE_IMAGE_REGISTRY} \ --set mise.imageRepository=${MISE_IMAGE_REPOSITORY} \ --set mise.imageDigest=${MISE_IMAGE_DIGEST} \ - --set mise.tenantId=${MISE_TENANT_ID} \ - --set mise.adInstance=${MISE_AD_INSTANCE} \ + --set mise.tenantId=$${TENANT_ID} \ + --set mise.azureAdInstance=${MISE_AZURE_AD_INSTANCE} \ + --set mise.azureAdClientId=${MISE_AZURE_AD_CLIENT_ID} \ --set mise.armInstance=${MISE_ARM_INSTANCE} \ --set mise.validAppId0=${MISE_VALID_APP_ID_0} \ --set mise.validAppId1=${MISE_VALID_APP_ID_1} \ diff --git a/frontend/deploy/helm/frontend/charts/mise/templates/deployment.yaml b/frontend/deploy/helm/frontend/charts/mise/templates/deployment.yaml index ad6b386a4..d96498f81 100644 --- a/frontend/deploy/helm/frontend/charts/mise/templates/deployment.yaml +++ b/frontend/deploy/helm/frontend/charts/mise/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: mise - namespace: {{ .Values.mise.namespace }} + namespace: {{ .Values.namespace }} spec: replicas: 1 selector: @@ -15,7 +15,7 @@ spec: spec: containers: - name: mise - image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageDigest }}" + image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}@{{ .Values.imageDigest }}" ports: - containerPort: 8080 livenessProbe: @@ -30,7 +30,7 @@ spec: - name: AzureAd__Instance value: {{ .Values.azureAdInstance }} - name: AzureAd__ClientId - value: {{ .Values.frontendClientId }} + value: {{ .Values.azureAdClientId }} - name: AzureAd__TenantId value: {{ .Values.tenantId }} - name: AzureAd__InboundPolicies__0__Label diff --git a/frontend/deploy/helm/frontend/charts/mise/templates/service.yaml b/frontend/deploy/helm/frontend/charts/mise/templates/service.yaml index 29589282f..da32bf6ea 100644 --- a/frontend/deploy/helm/frontend/charts/mise/templates/service.yaml +++ b/frontend/deploy/helm/frontend/charts/mise/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: mise - namespace: {{ .Values.mise.namespace }} + namespace: {{ .Values.namespace }} spec: selector: app: mise diff --git a/frontend/deploy/helm/frontend/charts/mise/values.yaml b/frontend/deploy/helm/frontend/charts/mise/values.yaml index fb07d5c55..a236635a7 100644 --- a/frontend/deploy/helm/frontend/charts/mise/values.yaml +++ b/frontend/deploy/helm/frontend/charts/mise/values.yaml @@ -1,10 +1,9 @@ -mise: - imageRegistry: "" - imageRepository: "" - imageDigest: "" - tenantId: "" - adInstance: "" - armInstance: "" - validAppId0: "" - validAppId1: "" - namespace: "" +imageRegistry: "" +imageRepository: "" +imageDigest: "" +tenantId: "" +adInstance: "" +armInstance: "" +validAppId0: "" +validAppId1: "" +namespace: "" diff --git a/frontend/pipeline.yaml b/frontend/pipeline.yaml index 957e48c94..2192bb143 100644 --- a/frontend/pipeline.yaml +++ b/frontend/pipeline.yaml @@ -40,9 +40,9 @@ resourceGroups: configRef: clusterService.k8s.serviceAccountName - name: DEPLOY_MISE configRef: mise.deploy - - name: VALID_APP_ID_0 + - name: MISE_VALID_APP_ID_0 configRef: mise.validAppId0 - - name: VALID_APP_ID_1 + - name: MISE_VALID_APP_ID_1 configRef: mise.validAppId1 - name: MISE_IMAGE_REGISTRY configRef: mise.image.registry @@ -52,5 +52,7 @@ resourceGroups: configRef: mise.image.digest - name: MISE_AZURE_AD_INSTANCE configRef: mise.azureAdInstance + - name: MISE_AZURE_AD_CLIENT_ID + configRef: mise.azureAdClientId - name: MISE_ARM_INSTANCE configRef: mise.armInstance