Merge pull request #6629 from dokku/k3s-image-pull-secrets-short
Use smaller reference to image pull secrets in secret naming
This commit is contained in:
2 files changed
+4
-4
No files matched your search
@@ -12,10 +12,10 @@ metadata:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/instance: image-pull-{{ $.Values.global.app_name }}.{{ $.Values.global.deploment_id }}
|
app.kubernetes.io/instance: {{ $.Values.global.app_name }}.ims.{{ $.Values.global.deploment_id }}
|
||||||
app.kubernetes.io/name: image-pull-{{ $.Values.global.app_name }}
|
app.kubernetes.io/name: {{ $.Values.global.app_name }}.ims
|
||||||
app.kubernetes.io/part-of: {{ $.Values.global.app_name }}
|
app.kubernetes.io/part-of: {{ $.Values.global.app_name }}
|
||||||
name: image-pull-{{ $.Values.global.app_name }}.{{ $.Values.global.deploment_id }}
|
name: {{ $.Values.global.app_name }}.ims.{{ $.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 }}"
|
||||||
|
|||||||
@@ -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("image-pull-%s.%d", appName, deploymentId)
|
imagePullSecrets = fmt.Sprintf("%s.ims.%d", appName, deploymentId)
|
||||||
pullSecretBase64 = base64.StdEncoding.EncodeToString(b)
|
pullSecretBase64 = base64.StdEncoding.EncodeToString(b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user