Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
export SCAN_PATH=$(pwd)/build.gradle
export CLIENT_ID=vaas
export CLIENT_SECRET=$(minikube kubectl -- get secret -n vaas vaas-client-secret -o jsonpath="{.data.secret}" | base64 -d)
export VAAS_URL=ws://vaas/ws
export VAAS_URL=http://vaas
export TOKEN_URL=http://vaas/auth/protocol/openid-connect/token
gradle fileScan
gradle fileScan
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ To set the image pull secret, you need to create a custom values.yaml file that
* `global.secret.dockerconfigjson`
* `global.secret.imagePullSecret`
* `global.imagePullSecret`
* `imagePullSecret`

```yaml
global:
imagePullSecret: "BASE64_ENCODED_JSON_CONTAINING_DOCKER_AUTH_CONFIG"
secret:
dockerconfigjson: "BASE64_ENCODED_JSON_CONTAINING_DOCKER_AUTH_CONFIG"
imagePullSecret: "BASE64_ENCODED_JSON_CONTAINING_DOCKER_AUTH_CONFIG"
Expand Down Expand Up @@ -202,8 +204,10 @@ In addition, Sentry will always behave as follows:

| Parameter | Description | Value |
| ----------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------------ |
| global.imagePullSecrets | List of image pull secrets | - name: registry |
| global.secret.dockerconfigjson | Docker authentication configuration | "" |
| imagePullSecret | Image pull secret | "e30K" |
| global.imagePullSecret | Global image pull secret | "e30K" |
| global.imagePullSecrets | List of image pull secrets | [] |
| global.secret.dockerconfigjson | Docker authentication configuration | "e30K" |
| cloud.hashLookup.enabled | Enable/Disable the cloud hash lookup | true |
| cloud.allowlistLookup.enabled | Enable/Disable the cloud allowlist lookup | true |
| gateway.ingress.enabled | Enable/Disable the Ingress resource | false |
Expand Down
2 changes: 1 addition & 1 deletion charts/vaas/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies:
condition: redis.enabled
repository: oci://registry-1.docker.io/bitnamicharts
- name: mini-identity-provider
version: 0.7.0
version: 0.8.0
condition: mini-identity-provider.enabled
repository: oci://ghcr.io/gdatasoftwareag
13 changes: 12 additions & 1 deletion charts/vaas/templates/gateway/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type: kubernetes.io/dockerconfigjson
apiVersion: v1
kind: Secret
metadata:
name: {{ include "gateway.fullname" . }}-global-image-pull-secret
name: {{ include "gateway.fullname" . }}-global-secret-image-pull-secret
namespace: {{ .Release.Namespace }}
data:
.dockerconfigjson: {{ .Values.global.secret.imagePullSecret }}
Expand All @@ -30,4 +30,15 @@ metadata:
data:
.dockerconfigjson: {{ .Values.global.secret.dockerconfigjson }}
type: kubernetes.io/dockerconfigjson
{{- end }}
{{- if (.Values.global).imagePullSecret }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ include "gateway.fullname" . }}-global-image-pull-secret
namespace: {{ .Release.Namespace }}
data:
.dockerconfigjson: {{ .Values.global.imagePullSecret }}
type: kubernetes.io/dockerconfigjson
{{- end }}
15 changes: 13 additions & 2 deletions charts/vaas/templates/gdscan/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type: kubernetes.io/dockerconfigjson
apiVersion: v1
kind: Secret
metadata:
name: {{ include "gdscan.fullname" . }}-global-image-pull-secret
name: {{ include "gdscan.fullname" . }}-global-secret-image-pull-secret
namespace: {{ .Release.Namespace }}
data:
.dockerconfigjson: {{ .Values.global.secret.imagePullSecret }}
Expand All @@ -30,4 +30,15 @@ metadata:
data:
.dockerconfigjson: {{ .Values.global.secret.dockerconfigjson }}
type: kubernetes.io/dockerconfigjson
{{- end }}
{{- end }}
{{- if (.Values.global).imagePullSecret }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ include "gdscan.fullname" . }}-global-image-pull-secret
namespace: {{ .Release.Namespace }}
data:
.dockerconfigjson: {{ .Values.global.imagePullSecret }}
type: kubernetes.io/dockerconfigjson
{{- end }}
1 change: 1 addition & 0 deletions charts/vaas/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
global:
imagePullSecret: "e30K"
imagePullSecrets: []
secret:
dockerconfigjson: "e30K"
Expand Down
Loading