Skip to content

fix: add azure auth related env into secrets #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
b4s36t4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add azure auth related env into secrets #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions charts/portkey-app/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,21 @@ Template containing common environment variables that are used by several servic
secretKeyRef:
name: {{ include "portkey.gatewaySecretsName" . }}
key: azureManagedClientId
- name: AZURE_ENTRA_CLIENT_ID
valueFrom:
secretKeyRef:
name: {{ include "portkey.gatewaySecretsName" . }}
key: azureEntraClientId
- name: AZURE_ENTRA_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: {{ include "portkey.gatewaySecretsName" . }}
key: azureEntraClientSecret
- name: AZURE_ENTRA_TENANT_ID
valueFrom:
secretKeyRef:
name: {{ include "portkey.gatewaySecretsName" . }}
key: azureEntraTenantId
- name: AZURE_STORAGE_ACCOUNT
valueFrom:
secretKeyRef:
Expand Down
3 changes: 3 additions & 0 deletions charts/portkey-app/templates/gateway/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ data:
logStore: {{ "azure" | b64enc }}
azureAuthMode: {{ .Values.logStorage.azure.AZURE_AUTH_MODE | b64enc | quote }}
azureManagedClientId: {{ .Values.logStorage.azure.AZURE_MANAGED_CLIENT_ID | b64enc | quote }}
azureEntraClientId: {{ .Values.logStorage.azure.AZURE_ENTRA_CLIENT_ID | b64enc | quote }}
azureEntraClientSecret: {{ .Values.logStorage.azure.AZURE_ENTRA_CLIENT_SECRET | b64enc | quote }}
azureEntraTenantId: {{ .Values.logStorage.azure.AZURE_ENTRA_TENANT_ID | b64enc | quote }}
azureStorageAccount: {{ .Values.logStorage.azure.AZURE_STORAGE_ACCOUNT | b64enc | quote }}
azureStorageKey: {{ .Values.logStorage.azure.AZURE_STORAGE_KEY | b64enc | quote }}
azureStorageContainer: {{ .Values.logStorage.azure.AZURE_STORAGE_CONTAINER | b64enc | quote }}
Expand Down
3 changes: 3 additions & 0 deletions charts/portkey-app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ logStorage:
enabled: false
AZURE_AUTH_MODE: ""
AZURE_MANAGED_CLIENT_ID: ""
AZURE_ENTRA_CLIENT_ID: ""
AZURE_ENTRA_CLIENT_SECRET: ""
AZURE_ENTRA_TENANT_ID: ""
AZURE_STORAGE_ACCOUNT: ""
AZURE_STORAGE_KEY: ""
AZURE_STORAGE_CONTAINER: ""
Expand Down
7 changes: 5 additions & 2 deletions charts/portkey-gateway/docs/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,11 @@ environment:
| `environment.data.AWS_ASSUME_ROLE_ACCESS_KEY_ID` | string | `""` | Access key for AWS role assumption (consider using secretKeys) |
| `environment.data.AWS_ASSUME_ROLE_SECRET_ACCESS_KEY` | string | `""` | Secret key for AWS role assumption (consider using secretKeys) |
| `environment.data.AWS_ASSUME_ROLE_REGION` | string | `""` | AWS region for role assumption |
| `environment.data.AZURE_AUTH_MODE` | string | `""` | Azure authentication mode |
| `environment.data.AZURE_MANAGED_CLIENT_ID` | string | `""` | Azure managed identity client ID |
| `environment.data.AZURE_AUTH_MODE` | string | `""` | Azure authentication mode (`managed`, `entra`, or empty for storage key) |
| `environment.data.AZURE_MANAGED_CLIENT_ID` | string | `""` | Azure managed identity client ID (used when `AZURE_AUTH_MODE=managed`) |
| `environment.data.AZURE_ENTRA_CLIENT_ID` | string | `""` | Azure Entra (service principal) client ID (used when `AZURE_AUTH_MODE=entra`) |
| `environment.data.AZURE_ENTRA_CLIENT_SECRET` | string | `""` | Azure Entra client secret (used when `AZURE_AUTH_MODE=entra`, consider using secretKeys) |
| `environment.data.AZURE_ENTRA_TENANT_ID` | string | `""` | Azure Entra tenant ID (used when `AZURE_AUTH_MODE=entra`) |
| `environment.data.AZURE_STORAGE_ACCOUNT` | string | `""` | Azure storage account name |
| `environment.data.AZURE_STORAGE_KEY` | string | `""` | Azure storage account key (consider using secretKeys) |
| `environment.data.AZURE_STORAGE_CONTAINER` | string | `""` | Azure storage container name |
Expand Down
2 changes: 1 addition & 1 deletion charts/portkey-gateway/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ Common Environment Env as Map
{{- define "logStore.commonEnv" -}}
{{- $commonEnv := include "portkeyenterprise.commonEnvMap" . | fromYaml -}}
{{- range $key, $value := $commonEnv }}
{{- if has $key (list "LOG_STORE" "MONGO_DB_CONNECTION_URL" "MONGO_DATABASE" "MONGO_COLLECTION_NAME" "MONGO_GENERATION_HOOKS_COLLECTION_NAME" "LOG_STORE_ACCESS_KEY" "LOG_STORE_SECRET_KEY" "LOG_STORE_REGION" "LOG_STORE_GENERATIONS_BUCKET" "LOG_STORE_BASEPATH" "LOG_STORE_AWS_ROLE_ARN" "LOG_STORE_AWS_EXTERNAL_ID" "AZURE_AUTH_MODE" "AZURE_STORAGE_ACCOUNT" "AZURE_STORAGE_KEY" "AZURE_STORAGE_CONTAINER") }}
{{- if has $key (list "LOG_STORE" "MONGO_DB_CONNECTION_URL" "MONGO_DATABASE" "MONGO_COLLECTION_NAME" "MONGO_GENERATION_HOOKS_COLLECTION_NAME" "LOG_STORE_ACCESS_KEY" "LOG_STORE_SECRET_KEY" "LOG_STORE_REGION" "LOG_STORE_GENERATIONS_BUCKET" "LOG_STORE_BASEPATH" "LOG_STORE_AWS_ROLE_ARN" "LOG_STORE_AWS_EXTERNAL_ID" "AZURE_AUTH_MODE" "AZURE_STORAGE_ACCOUNT" "AZURE_STORAGE_KEY" "AZURE_STORAGE_CONTAINER" "AZURE_MANAGED_CLIENT_ID" "AZURE_ENTRA_CLIENT_ID" "AZURE_ENTRA_CLIENT_SECRET" "AZURE_ENTRA_TENANT_ID") }}
Comment thread
b4s36t4 marked this conversation as resolved.
{{- include "portkeyenterprise.renderEnvVar" (list $key $value) | nindent 0 }}
{{- end }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/portkey-gateway/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ environment:
AWS_ASSUME_ROLE_REGION:
AZURE_AUTH_MODE:
AZURE_MANAGED_CLIENT_ID:
AZURE_ENTRA_CLIENT_ID:
AZURE_ENTRA_CLIENT_SECRET:
AZURE_ENTRA_TENANT_ID:
Comment thread
b4s36t4 marked this conversation as resolved.
AZURE_STORAGE_ACCOUNT:
AZURE_STORAGE_KEY:
AZURE_STORAGE_CONTAINER:
Expand Down