Add flexible ImagePullSecrets support
#1897
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Just a general comment: local variables, e.g. as arguments, always should be lowercase. |
|
And to get a list instead of a string, use a |
zc-devs
reviewed
Jul 1, 2023
| @@ -53,3 +53,9 @@ helm upgrade --install woodpecker-agent --namespace <namespace> woodpecker/woodp | |||
| # Uninstall | |||
| helm delete woodpecker-agent | |||
| ``` | |||
|
|
|||
| ## ImagePullSecrets | |||
There was a problem hiding this comment.
Shouldn't it be in docs/docs/30-administration/22-backends/40-kubernetes.md? There also should be description of the env var.
zc-devs
reviewed
Jul 1, 2023
| ## ImagePullSecrets | ||
|
|
||
| By default pods look for a secret named "regcred" in the respective namespace. | ||
| Existing secrets can be used by overwriting the default secret name Woodpecker is looking for via the k8s backend option `backend-k8s-pod-image-pull-secret`. |
There was a problem hiding this comment.
Suggested change
| Existing secrets can be used by overwriting the default secret name Woodpecker is looking for via the k8s backend option `backend-k8s-pod-image-pull-secret`. | |
| Existing secrets can be used by overwriting the default secret name Woodpecker is looking for via the `WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS` environment variable. |
qwerty287
reviewed
Jul 2, 2023
Comment on lines
+378
to
+383
| &cli.StringFlag{ | ||
| EnvVars: []string{"WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS"}, | ||
| Name: "backend-k8s-pod-image-pull-secrets", | ||
| Usage: "backend k8s pull secrets for private registries", | ||
| Value: "regcred", | ||
| }, |
There was a problem hiding this comment.
Suggested change
| &cli.StringFlag{ | |
| EnvVars: []string{"WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS"}, | |
| Name: "backend-k8s-pod-image-pull-secrets", | |
| Usage: "backend k8s pull secrets for private registries", | |
| Value: "regcred", | |
| }, | |
| &cli.StringSliceFlag{ | |
| EnvVars: []string{"WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS"}, | |
| Name: "backend-k8s-pod-image-pull-secrets", | |
| Usage: "backend k8s pull secrets for private registries", | |
| Value: []string{}, | |
| }, |
Comment on lines
+193
to
+197
| &cli.StringFlag{ | ||
| EnvVars: []string{"WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS"}, | ||
| Name: "backend-k8s-pod-image-pull-secrets", | ||
| Usage: "backend k8s pull secrets for private registries", | ||
| Value: "regcred", |
There was a problem hiding this comment.
Suggested change
| &cli.StringFlag{ | |
| EnvVars: []string{"WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS"}, | |
| Name: "backend-k8s-pod-image-pull-secrets", | |
| Usage: "backend k8s pull secrets for private registries", | |
| Value: "regcred", | |
| &cli.StringSliceFlag{ | |
| EnvVars: []string{"WOODPECKER_BACKEND_K8S_IMAGE_PULL_SECRETS"}, | |
| Name: "backend-k8s-pod-image-pull-secrets", | |
| Usage: "backend k8s pull secrets for private registries", | |
| Value: []string{}, | |
| }, |
| @@ -11,7 +11,7 @@ import ( | |||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | |||
| ) | |||
|
|
|||
| func Pod(namespace string, step *types.Step, labels, annotations map[string]string) (*v1.Pod, error) { | |||
| func Pod(namespace string, step *types.Step, labels, annotations map[string]string, ImagePullSecrets) (*v1.Pod, error) { | |||
There was a problem hiding this comment.
Suggested change
| func Pod(namespace string, step *types.Step, labels, annotations map[string]string, ImagePullSecrets) (*v1.Pod, error) { | |
| func Pod(namespace string, step *types.Step, labels, annotations map[string]string, imagePullSecrets []v1.LocalObjectReference) (*v1.Pod, error) { |
|
Nice PR. Is it possible to assume some default? In general, ServiceAccounts already have this configuration, if we don't set anything they use the configuration inside ServiceAccount. |
This was referenced Dec 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently
ImagePullSecretsis hardcoded to a secret namedregcred:woodpecker/pipeline/backend/kubernetes/pod.go
Line 135 in e1c31df
This PR aims to make it more flexible and let users specify multiple secrets via a server-wide k8s backend option, similar to labels and annotations.
@woodpecker-ci/maintainers
My golang skils are limited and I've added some
FIXMEs in places where I need help for a "proper" implementation.