github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #6641 from dokku/k3s-image-pull-secrets-rename

Browse Source 
Rename image pull secrets to standardize on secret naming pattern
This commit is contained in:
Jose Diaz-Gonzalez
2024-02-28 00:40:13 -05:00
committed by GitHub
parent ba8859561f 7c376d3e6d
commit a1eda40ffd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/scheduler-k3s/templates/chart/image-pull-secret.yaml
View File

@@ -12,10 +12,10 @@ metadata:
{{- end }} {{- end }}
{{- end }} {{- end }}
labels: labels:
app.kubernetes.io/instance: {{ $.Values.global.app_name }}.ims.{{ $.Values.global.deploment_id }} app.kubernetes.io/instance: ims-{{ $.Values.global.app_name }}.{{ $.Values.global.deploment_id }}
app.kubernetes.io/name: {{ $.Values.global.app_name }}.ims app.kubernetes.io/name: ims-{{ $.Values.global.app_name }}
app.kubernetes.io/part-of: {{ $.Values.global.app_name }} app.kubernetes.io/part-of: {{ $.Values.global.app_name }}
name: {{ $.Values.global.app_name }}.ims.{{ $.Values.global.deploment_id }} name: ims-{{ $.Values.global.app_name }}.{{ $.Values.global.deploment_id }}
namespace: {{ $.Values.global.namespace }} namespace: {{ $.Values.global.namespace }}
data: data:
.dockerconfigjson: "{{ $.Values.global.image.pull_secret_base64 }}" .dockerconfigjson: "{{ $.Values.global.image.pull_secret_base64 }}"

2
plugins/scheduler-k3s/triggers.go
View File

@@ -179,7 +179,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
return fmt.Errorf("Error reading docker config: %w", err) return fmt.Errorf("Error reading docker config: %w", err)
} }
imagePullSecrets = fmt.Sprintf("%s.ims.%d", appName, deploymentId) imagePullSecrets = fmt.Sprintf("ims-%s.%d", appName, deploymentId)
pullSecretBase64 = base64.StdEncoding.EncodeToString(b) pullSecretBase64 = base64.StdEncoding.EncodeToString(b)
} }
} }