Skip to content

Commit 0c09ccb

Browse files
Merge pull request #1237 from Roming22/fix/disable-azure-login
fix: disable microsoft auth in DH
2 parents 159caa3 + 951f53c commit 0c09ccb

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

installer/charts/tssc-dh/templates/app-config-content.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ app:
2323
{{- fail (printf "Github Integration required for github auth provider") }}
2424
{{- else if and (not $gitlabSecretObj) (eq .Values.developerHub.authProvider "gitlab") }}
2525
{{- fail (printf "Gitlab Integration required for gitlab auth provider") }}
26-
{{- else if and (not $azureSecretObj) (eq .Values.developerHub.authProvider "microsoft") }}
27-
{{- fail (printf "Azure Integration required for microsoft auth provider") }}
2826
{{- end }}
2927

3028
{{- if $argocdSecretData }}
@@ -52,16 +50,6 @@ auth:
5250
environment: production
5351
providers:
5452
{{- $signInPage := "" }}
55-
{{- if eq .Values.developerHub.authProvider "microsoft" }}
56-
{{- if and $azureSecretData.clientId $azureSecretData.clientSecret $azureSecretData.tenantId }}
57-
{{- $signInPage = "microsoft" }}
58-
microsoft:
59-
production:
60-
clientId: ${AZURE__CLIENT__ID}
61-
clientSecret: ${AZURE__CLIENT__SECRET}
62-
tenantId: ${AZURE__TENANT__ID}
63-
{{- end }}
64-
{{- end }}
6553
{{- if eq .Values.developerHub.authProvider "github" }}
6654
{{- $signInPage = "github" }}
6755
github:

installer/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ tssc:
7272
# namespacePrefixes:
7373
# - tssc-app
7474
authProvider: github
75-
# Possible values: github, gitlab, microsoft
75+
# Possible values: github, gitlab
7676
# RBAC:
7777
# adminUsers:
7878
# - myUsername

0 commit comments

Comments
 (0)