Skip to content
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.

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

[scalardl-auditor] Support Azure Marketplace #278

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions charts/scalardl-audit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,8 @@ Current chart version is `3.0.0-SNAPSHOT`
| envoy.service.ports.envoy.targetPort | int | `40051` | envoy k8s internal name |
| envoy.service.type | string | `"ClusterIP"` | service types in kubernetes |
| fullnameOverride | string | `""` | String to fully override scalardl-audit.fullname template |
| global.azure | object | `{"images":{"envoy":{"image":"scalar-envoy","registry":"scalar.azurecr.io","tag":"2.0.0-SNAPSHOT"},"scalardlAuditor":{"image":"scalardl-auditor-azure-payg","registry":"scalar.azurecr.io","tag":"4.0.0-SNAPSHOT"}}}` | Azure Marketplace specific configurations. |
| global.azure.images.envoy | object | `{"image":"scalar-envoy","registry":"scalar.azurecr.io","tag":"2.0.0-SNAPSHOT"}` | Container image of Envoy for Azure Marketplace. |
| global.azure.images.scalardlAuditor | object | `{"image":"scalardl-auditor-azure-payg","registry":"scalar.azurecr.io","tag":"4.0.0-SNAPSHOT"}` | Container image of ScalarDL Auditor for Azure Marketplace. |
| global.platform | string | `""` | Specify the platform that you use. This configuration is for internal use. |
| nameOverride | string | `""` | String to partially override scalardl-audit.fullname template (will maintain the release name) |
7 changes: 7 additions & 0 deletions charts/scalardl-audit/templates/auditor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ spec:
checksum/config: {{ include (print $.Template.BasePath "/auditor/configmap.yaml") . | sha256sum }}
labels:
{{- include "scalardl-audit-auditor.selectorLabels" . | nindent 8 }}
{{- if eq .Values.global.platform "azure" }}
azure-extensions-usage-release-identifier: {{ .Release.Name }}
{{- end }}
spec:
restartPolicy: Always
{{- if .Values.auditor.serviceAccount.serviceAccountName }}
Expand Down Expand Up @@ -75,7 +78,11 @@ spec:
- name: {{ .Chart.Name }}-auditor
securityContext:
{{- toYaml .Values.auditor.securityContext | nindent 12 }}
{{- if eq .Values.global.platform "azure" }}
image: "{{ .Values.global.azure.images.scalardlAuditor.registry }}/{{ .Values.global.azure.images.scalardlAuditor.image }}:{{ .Values.global.azure.images.scalardlAuditor.tag }}"
{{- else }}
image: "{{ .Values.auditor.image.repository }}:{{ .Values.auditor.image.version }}"
{{- end }}
imagePullPolicy: {{ .Values.auditor.image.pullPolicy }}
volumeMounts:
{{- if not .Values.auditor.extraVolumeMounts }}
Expand Down
46 changes: 46 additions & 0 deletions charts/scalardl-audit/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,52 @@
"fullnameOverride": {
"type": "string"
},
"global": {
"type": "object",
"properties": {
"azure": {
"type": "object",
"properties": {
"images": {
"type": "object",
"properties": {
"envoy": {
"type": "object",
"properties": {
"image": {
"type": "string"
},
"registry": {
"type": "string"
},
"tag": {
"type": "string"
}
}
},
"scalardlAuditor": {
"type": "object",
"properties": {
"image": {
"type": "string"
},
"registry": {
"type": "string"
},
"tag": {
"type": "string"
}
}
}
}
}
}
},
"platform": {
"type": "string"
}
}
},
"nameOverride": {
"type": "string"
}
Expand Down
17 changes: 17 additions & 0 deletions charts/scalardl-audit/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

global:
# -- Specify the platform that you use. This configuration is for internal use.
platform: ""
# -- Azure Marketplace specific configurations.
azure:
images:
# -- Container image of ScalarDL Auditor for Azure Marketplace.
scalardlAuditor:
tag: "4.0.0-SNAPSHOT"
image: "scalardl-auditor-azure-payg"
registry: "scalar.azurecr.io"
# -- Container image of Envoy for Azure Marketplace.
envoy:
tag: "2.0.0-SNAPSHOT"
image: "scalar-envoy"
registry: "scalar.azurecr.io"

# -- String to partially override scalardl-audit.fullname template (will maintain the release name)
nameOverride: ""

Expand Down
Loading