Fix certificate generation script arguments

.github/workflows/release-chart.yaml

@@ -4,9 +4,9 @@ on:
   push:
     branches:
       - main
-      - release/legacy-csr
+# TODO: add this back
-    paths:
+#    paths:
-      - 'charts/**'
+#      - 'helm/**'
 
 jobs:
   release:
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+        with:
+          ref: main
 
       - name: Configure Git
         run: |
@@ -46,6 +48,8 @@ jobs:
 
       - name: Run chart-releaser
         if: steps.helm_version_checker.outcome == 'success'
-        uses: helm/chart-releaser-action@v1.2.1
+        uses: helm/chart-releaser-action@master
+        with:
+          charts_dir: 'helm'
         env:
-          CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          CR_TOKEN: '${{ secrets.CR_TOKEN }}'

.github/workflows/release-docker.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - devel
 
 jobs:
   release:
@@ -13,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
         with:
-          ref: ${{ github.ref }}
+          ref: main
 
       - name: Configure Git
         run: |
@@ -23,8 +22,8 @@ jobs:
       - name: Build and push docker images (make image)
         run: make image
         env:
-          DOCKER_USER: ${GITHUB_ACTOR}
+          DOCKER_USER: '${{ secrets.DOCKER_USER }}'
-          DOCKER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKER_TOKEN: '${{ secrets.DOCKER_TOKEN }}'
 
       - name: Logout from dockerhub (make docker-logout)
         run: make docker-logout

Makefile

@@ -1,8 +1,7 @@
 # Image URL to use all building/pushing image targets;
 # Use your own docker registry and image name for dev/test by overridding the
 # IMAGE_REPO, IMAGE_NAME and IMAGE_TAG environment variable.
-REPOSITORY_BASE ?= ghcr.io
+IMAGE_REPO ?= marshallmarshall
-IMAGE_REPO ?= $(REPOSITORY_BASE)/ysoftdevs/imagepullsecret-injector
 IMAGE_NAME ?= imagepullsecret-injector
 GENERATOR_IMAGE_NAME ?= webhook-cert-generator
 
@@ -82,7 +81,7 @@ build-linux:
 image: docker-login build-image push-image
 
 docker-login:
-	@echo "$(DOCKER_TOKEN)" | docker login -u "$(DOCKER_USER)" --password-stdin "$(REPOSITORY_BASE)"
+	@echo ${DOCKER_TOKEN} | docker login -u ${DOCKER_USER} --password-stdin
 
 docker-logout:
 	@docker logout

README.md

@@ -3,8 +3,10 @@
 The responsibility of this webhook is to patch all newly created/updated service account and make sure they all contained proper imagepullsecret configuration. 
 
 This repo produces one helm chart available via helm repository https://ysoftdevs.github.io/imagepullsecret-injector. There are also 2 docker images:
-- `ghcr.io/ysoftdevs/imagepullsecret-injector/imagepullsecret-injector` - the image containing the webhook itself
+- `marshallmarshall/imagepullsecret-injector` - the image containing the webhook itself
-- `ghcr.io/ysoftdevs/imagepullsecret-injector/webhook-cert-generator` - helper image responsible for (re)generating the certificates
+- `marshallmarshall/webhook-cert-generator` - helper image responsible for (re)generating the certificates
+
+
 
 ## Helm description
 The helm chart consists of 2 parts: the certificate generator and the webhook configuration itself.
@@ -40,7 +42,7 @@ Of note is also a fact that the chart runs a lookup to the connected cluster to
     make build-image
     helm upgrade -i imagepullsecret-injector \
         -n imagepullsecret-injector \
-        charts/imagepullsecret-injector
+        helm/imagepullsecret-injector
     ```
     Alternatively, you can use the pre-built, publicly available helm chart and docker images:
     ```bash
@@ -57,6 +59,3 @@ Of note is also a fact that the chart runs a lookup to the connected cluster to
     kubectl get sa -n yolo default -ojsonpath='{.imagePullSecrets}'
     ```
     The `get` command should display _some_ non-empty result.
-
-## Releasing locally
-To authenticate to the docker registry to push the images manually, you will need your own Github Personal Access Token. For more information follow this guide https://docs.github.com/en/packages/guides/migrating-to-github-container-registry-for-docker-images#authenticating-with-the-container-registry

VERSION

@@ -1 +1 @@
-0.0.12
+0.0.9

build/Dockerfile

@@ -7,7 +7,4 @@ RUN make build
 FROM alpine:3.13.4 as base
 COPY --from=builder /go/src/github.com/ysoftdevs/imagepullsecret-injector/build/_output/bin/imagepullsecret-injector /usr/local/bin/imagepullsecret-injector
 
-RUN addgroup -S imagepullsecret-injector-group && adduser -S imagepullsecret-injector-user -G imagepullsecret-injector-group
-USER imagepullsecret-injector-user
-
 ENTRYPOINT ["imagepullsecret-injector"]

build/Dockerfile.cert-generator

@@ -1,9 +1,6 @@
 FROM alpine:3.13.4
 
-RUN addgroup -S imagepullsecret-injector-group && adduser -S imagepullsecret-injector-user -G imagepullsecret-injector-group \
+RUN apk add bash curl openssl \
-    && apk add bash curl openssl jq \
     && curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
     && chmod 755 ./kubectl \
     && mv ./kubectl /usr/bin/kubectl
-
-USER imagepullsecret-injector-user

cmd/main.go

@@ -8,11 +8,40 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"strconv"
 	"syscall"
 
 	"github.com/golang/glog"
 )
 
+func LookupStringEnv(envName string, defVal string) string {
+	if envVal, exists := os.LookupEnv(envName); exists {
+		return envVal
+	}
+
+	return defVal
+}
+
+func LookupBoolEnv(envName string, defVal bool) bool {
+	if envVal, exists := os.LookupEnv(envName); exists {
+		if boolVal, err := strconv.ParseBool(envVal); err == nil {
+			return boolVal
+		}
+	}
+
+	return defVal
+}
+
+func LookupIntEnv(envName string, defVal int) int {
+	if envVal, exists := os.LookupEnv(envName); exists {
+		if intVal, err := strconv.Atoi(envVal); err == nil {
+			return intVal
+		}
+	}
+
+	return defVal
+}
+
 func main() {
 	parameters := DefaultParametersObject()
 
@@ -31,9 +60,9 @@ func main() {
 
 	glog.Infof("Running with config: %+v", parameters)
 
-	whsvr, err := NewWebhookServer(
+	whsvr := &WebhookServer{
-		&parameters,
+		config: &parameters,
-		&http.Server{
+		server: &http.Server{
 			Addr: fmt.Sprintf(":%v", parameters.port),
 			// This is quite inefficient as it loads file contents on every TLS ClientHello, but ¯\_(ツ)_/¯
 			TLSConfig: &tls.Config{GetCertificate: func(info *tls.ClientHelloInfo) (*tls.Certificate, error) {
@@ -42,9 +71,6 @@ func main() {
 				return &cert, err
 			}},
 		},
-	)
-	if err != nil {
-		glog.Exitf("Could not create the Webhook server: %v", err)
 	}
 
 	// define http server and server handler

cmd/utils.go

@@ -1,55 +0,0 @@
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"strconv"
-	"strings"
-)
-
-// LookupStringEnv either returns the the value of the env variable, or the provided default value, if the env doesn't exist
-func LookupStringEnv(envName string, defVal string) string {
-	if envVal, exists := os.LookupEnv(envName); exists {
-		return envVal
-	}
-
-	return defVal
-}
-
-// LookupBoolEnv either returns the the value of the env variable, or the provided default value, if the env doesn't exist
-func LookupBoolEnv(envName string, defVal bool) bool {
-	if envVal, exists := os.LookupEnv(envName); exists {
-		if boolVal, err := strconv.ParseBool(envVal); err == nil {
-			return boolVal
-		}
-	}
-
-	return defVal
-}
-
-// LookupIntEnv either returns the the value of the env variable, or the provided default value, if the env doesn't exist
-func LookupIntEnv(envName string, defVal int) int {
-	if envVal, exists := os.LookupEnv(envName); exists {
-		if intVal, err := strconv.Atoi(envVal); err == nil {
-			return intVal
-		}
-	}
-
-	return defVal
-}
-
-func getCurrentNamespace() string {
-	// Check whether we have overridden the namespace
-	if ns, ok := os.LookupEnv("POD_NAMESPACE"); ok {
-		return ns
-	}
-
-	// Fall back to the namespace associated with the service account token, if available (this should exist if running in a K8S pod)
-	if data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
-		if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
-			return ns
-		}
-	}
-
-	return "default"
-}

cmd/webhook.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"net/http"
+	"os"
 	"strings"
 
 	"github.com/golang/glog"
@@ -29,14 +30,13 @@ var (
 type WebhookServer struct {
 	server *http.Server
 	config *WhSvrParameters
-	client *kubernetes.Clientset
 }
 
-// WhSvrParameters represents all configuration options available though cmd parameters or env variables
+// Webhook Server parameters
 type WhSvrParameters struct {
-	port                           int
+	port                           int    // webhook server port
-	certFile                       string
+	certFile                       string // path to the x509 certificate for https
-	keyFile                        string
+	keyFile                        string // path to the x509 private key matching `CertFile`
 	excludeNamespaces              string
 	serviceAccounts                string
 	allServiceAccounts             bool
@@ -57,28 +57,6 @@ var (
 	}
 )
 
-// NewWebhookServer constructor for WebhookServer
-func NewWebhookServer(parameters *WhSvrParameters, server *http.Server) (*WebhookServer, error) {
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		glog.Errorf("Could not create k8s client: %v", err)
-		return nil, err
-	}
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		glog.Errorf("Could not create k8s clientset: %v", err)
-		return nil, err
-	}
-
-	return &WebhookServer{
-		config: parameters,
-		server: server,
-		client: clientset,
-	}, nil
-
-}
-
-// DefaultParametersObject returns a parameters object with the default values
 func DefaultParametersObject() WhSvrParameters {
 	return WhSvrParameters{
 		port:                           8443,
@@ -129,44 +107,65 @@ func addImagePullSecret(target, added []corev1.LocalObjectReference, basePath st
 	return patch
 }
 
-// ensureSecrets looks up the source secret and makes sure the namespace the patched SA is in contains it too
+func getCurrentNamespace() string {
+	// This way assumes you've set the POD_NAMESPACE environment variable using the downward API.
+	// This check has to be done first for backwards compatibility with the way InClusterConfig was originally set up
+	if ns, ok := os.LookupEnv("POD_NAMESPACE"); ok {
+		return ns
+	}
+
+	// Fall back to the namespace associated with the service account token, if available
+	if data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
+		if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
+			return ns
+		}
+	}
+
+	return "default"
+}
+
 func (whsvr *WebhookServer) ensureSecrets(ar *v1beta1.AdmissionReview) error {
 	glog.Infof("Ensuring existing secrets")
-	targetNamespace := ar.Request.Namespace
+	namespace := ar.Request.Namespace
 
+	config, err := rest.InClusterConfig()
+	if err != nil {
+		glog.Errorf("Could not create k8s client: %v", err)
+		return err
+	}
+	clientset, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		glog.Errorf("Could not create k8s clientset: %v", err)
+		return err
+	}
 	currentNamespace := getCurrentNamespace()
 
 	glog.Infof("Looking for the source secret")
-	sourceSecret, err := whsvr.client.CoreV1().Secrets(whsvr.config.sourceImagePullSecretNamespace).Get(whsvr.config.sourceImagePullSecretName, metav1.GetOptions{})
+	sourceSecret, err := clientset.CoreV1().Secrets(whsvr.config.sourceImagePullSecretNamespace).Get(whsvr.config.sourceImagePullSecretName, metav1.GetOptions{})
 	if err != nil {
 		glog.Errorf("Could not fetch source secret %s in namespace %s: %v", whsvr.config.sourceImagePullSecretName, currentNamespace, err)
 		return err
 	}
-	if sourceSecret.Type != corev1.SecretTypeDockerConfigJson {
-		err := fmt.Errorf("source secret %s in namespace %s exists, but has incorrect type (is %s, should be %s)", whsvr.config.sourceImagePullSecretName, currentNamespace, sourceSecret.Type, corev1.SecretTypeDockerConfigJson)
-		glog.Errorf("%v", err)
-		return err
-	}
 	glog.Infof("Source secret found")
 
 	glog.Infof("Looking for the existing target secret")
-	secret, err := whsvr.client.CoreV1().Secrets(targetNamespace).Get(whsvr.config.targetImagePullSecretName, metav1.GetOptions{})
+	secret, err := clientset.CoreV1().Secrets(namespace).Get(whsvr.config.targetImagePullSecretName, metav1.GetOptions{})
 	if err != nil && !errors.IsNotFound(err) {
-		glog.Errorf("Could not fetch secret %s in namespace %s: %v", whsvr.config.targetImagePullSecretName, targetNamespace, err)
+		glog.Errorf("Could not fetch secret %s in namespace %s: %v", whsvr.config.targetImagePullSecretName, namespace, err)
 		return err
 	}
 
 	if err != nil && errors.IsNotFound(err) {
 		glog.Infof("Target secret not found, creating a new one")
-		if _, createErr := whsvr.client.CoreV1().Secrets(targetNamespace).Create(&corev1.Secret{
+		if _, createErr := clientset.CoreV1().Secrets(namespace).Create(&corev1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      whsvr.config.targetImagePullSecretName,
-				Namespace: targetNamespace,
+				Namespace: namespace,
 			},
 			Data: sourceSecret.Data,
 			Type: sourceSecret.Type,
 		}); createErr != nil {
-			glog.Errorf("Could not create secret %s in namespace %s: %v", whsvr.config.targetImagePullSecretName, targetNamespace, err)
+			glog.Errorf("Could not create secret %s in namespace %s: %v", whsvr.config.targetImagePullSecretName, namespace, err)
 			return err
 		}
 		glog.Infof("Target secret created successfully")
@@ -175,8 +174,8 @@ func (whsvr *WebhookServer) ensureSecrets(ar *v1beta1.AdmissionReview) error {
 
 	glog.Infof("Target secret found, updating")
 	secret.Data = sourceSecret.Data
-	if _, err := whsvr.client.CoreV1().Secrets(targetNamespace).Update(secret); err != nil {
+	if _, err := clientset.CoreV1().Secrets(namespace).Update(secret); err != nil {
-		glog.Errorf("Could not update secret %s in namespace %s: %v", whsvr.config.targetImagePullSecretName, targetNamespace, err)
+		glog.Errorf("Could not update secret %s in namespace %s: %v", whsvr.config.targetImagePullSecretName, namespace, err)
 		return err
 	}
 	glog.Infof("Target secret updated successfully")
@@ -184,7 +183,6 @@ func (whsvr *WebhookServer) ensureSecrets(ar *v1beta1.AdmissionReview) error {
 	return nil
 }
 
-// shouldMutate goes through all filters and determines whether the incoming SA matches them
 func (whsvr *WebhookServer) shouldMutate(sa corev1.ServiceAccount) bool {
 	for _, excludedNamespace := range strings.Split(whsvr.config.excludeNamespaces, ",") {
 		if sa.Namespace == excludedNamespace {
@@ -205,7 +203,6 @@ func (whsvr *WebhookServer) shouldMutate(sa corev1.ServiceAccount) bool {
 	return false
 }
 
-// mutateServiceAccount contains the whole mutation logic
 func (whsvr *WebhookServer) mutateServiceAccount(ar *v1beta1.AdmissionReview) *v1beta1.AdmissionResponse {
 	req := ar.Request
 	glog.Infof("Unmarshalling the ServiceAccount object from request")
@@ -278,8 +275,8 @@ func (whsvr *WebhookServer) mutateServiceAccount(ar *v1beta1.AdmissionReview) *v
 	}
 }
 
-func parseIncomingRequest(r *http.Request) (v1beta1.AdmissionReview, *errors.StatusError) {
+// Serve method for webhook server
-	var ar v1beta1.AdmissionReview
+func (whsvr *WebhookServer) serve(w http.ResponseWriter, r *http.Request) {
 	var body []byte
 	if r.Body != nil {
 		if data, err := ioutil.ReadAll(r.Body); err == nil {
@@ -287,69 +284,50 @@ func parseIncomingRequest(r *http.Request) (v1beta1.AdmissionReview, *errors.Sta
 		}
 	}
 	if len(body) == 0 {
-		glog.Error("Empty body")
+		glog.Error("empty body")
-		return ar, errors.NewBadRequest("Empty body")
+		http.Error(w, "empty body", http.StatusBadRequest)
+		return
 	}
 
 	// verify the content type is accurate
 	contentType := r.Header.Get("Content-Type")
 	if contentType != "application/json" {
 		glog.Errorf("Content-Type=%s, expect application/json", contentType)
-		err := &errors.StatusError{ErrStatus: metav1.Status{
+		http.Error(w, "invalid Content-Type, expect `application/json`", http.StatusUnsupportedMediaType)
-			Status:  metav1.StatusFailure,
+		return
-			Message: fmt.Sprintf("Content-Type=%s, expect application/json", contentType),
-			Reason:  metav1.StatusReasonUnsupportedMediaType,
-			Code:    http.StatusUnsupportedMediaType,
-		}}
-		return ar, err
 	}
 
+	var admissionResponse *v1beta1.AdmissionResponse
+	ar := v1beta1.AdmissionReview{}
 	if _, _, err := deserializer.Decode(body, nil, &ar); err != nil {
-		glog.Error("Could not parse the request body")
+		glog.Errorf("Can't decode body: %v", err)
-		return ar, errors.NewBadRequest(fmt.Sprintf("Could not parse the request body: %+v", err))
+		admissionResponse = &v1beta1.AdmissionResponse{
+			Result: &metav1.Status{
+				Message: err.Error(),
+			},
+		}
+	} else {
+		admissionResponse = whsvr.mutateServiceAccount(&ar)
 	}
 
-	return ar, nil
+	admissionReview := v1beta1.AdmissionReview{
-}
+		TypeMeta: metav1.TypeMeta{Kind: "AdmissionReview", APIVersion: "admission.k8s.io/v1"},
+	}
+	if admissionResponse != nil {
+		admissionReview.Response = admissionResponse
+		if ar.Request != nil {
+			admissionReview.Response.UID = ar.Request.UID
+		}
+	}
 
-func (whsvr *WebhookServer) sendResponse(w http.ResponseWriter, admissionReview v1beta1.AdmissionReview) error {
 	resp, err := json.Marshal(admissionReview)
 	if err != nil {
 		glog.Errorf("Can't encode response: %v", err)
 		http.Error(w, fmt.Sprintf("could not encode response: %v", err), http.StatusInternalServerError)
-		return err
 	}
-	glog.Infof("Writing response")
+	glog.Infof("Ready to write reponse ...")
 	if _, err := w.Write(resp); err != nil {
 		glog.Errorf("Can't write response: %v", err)
 		http.Error(w, fmt.Sprintf("could not write response: %v", err), http.StatusInternalServerError)
-		return err
-	}
-
-	return nil
-}
-
-// serve parses the raw incoming request, calls the mutation logic and sends the proper response
-func (whsvr *WebhookServer) serve(w http.ResponseWriter, r *http.Request) {
-	admissionReviewIn, statusErr := parseIncomingRequest(r)
-	if statusErr != nil {
-		http.Error(w, statusErr.ErrStatus.Message, int(statusErr.ErrStatus.Code))
-		return
-	}
-
-	admissionResponse := whsvr.mutateServiceAccount(&admissionReviewIn)
-
-	admissionReviewOut := v1beta1.AdmissionReview{
-		TypeMeta: metav1.TypeMeta{Kind: "AdmissionReview", APIVersion: "admission.k8s.io/v1"},
-	}
-	if admissionResponse != nil {
-		admissionReviewOut.Response = admissionResponse
-		if admissionReviewIn.Request != nil {
-			admissionReviewOut.Response.UID = admissionReviewIn.Request.UID
-		}
-	}
-
-	if err := whsvr.sendResponse(w, admissionReviewOut); err != nil {
-		glog.Errorf("Could not send response %v", err)
 	}
 }

helm/imagepullsecret-injector/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.21
+version: 0.0.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.0.12
+appVersion: 0.0.9

helm/imagepullsecret-injector/scripts/create-signed-cert.sh

@@ -83,27 +83,22 @@ echo "Deleting old CertificateSigningRequests"
 kubectl delete csr ${csrName} 2>/dev/null || true
 
 echo "Creating new CertificateSigningRequests"
-# create server cert/key CSR and  send to k8s API
+# create  server cert/key CSR and  send to k8s API
-jq -n --arg request "$(< "${tmpdir}"/server.csr base64)" \
+cat <<EOF | kubectl create -f -
-  --arg namespace "$namespace" \
+apiVersion: certificates.k8s.io/v1
-  --arg csrName "$csrName" '{
+kind: CertificateSigningRequest
-    apiVersion: "certificates.k8s.io/v1",
+metadata:
-    kind: "CertificateSigningRequest",
+  name: ${csrName}
-    metadata: {
+spec:
-      name: $csrName,
+  signerName: kubernetes.io/kubelet-serving
-      namespace: $namespace
+  groups:
-    },
+  - system:authenticated
-    spec: {
+  request: $(< "${tmpdir}"/server.csr base64 | tr -d '\n')
-      signerName: "kubernetes.io/kubelet-serving",
+  usages:
-      groups: ["system:authenticated"],
+  - digital signature
-      request: $request,
+  - key encipherment
-      usages: [
+  - server auth
-        "digital signature",
+EOF
-        "key encipherment",
-        "server auth"
-      ]
-    }
-  }' | kubectl create -f -
 
 # verify CSR has been created
 while true; do

helm/imagepullsecret-injector/templates/certificate-gen/cronjob-certificate-gen.yaml

@@ -1,18 +1,17 @@
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: "{{ .Release.Name }}-cert-gen-cron-job"
+  name: "{{ .Release.Name }}"
   labels:
     {{- include "imagepullsecret-injector.labels" . | nindent 4 }}
 spec:
-  schedule: '* * * * 0'
+  schedule: '* * * * *'
   jobTemplate:
     metadata:
       name: "{{ .Release.Name }}"
       labels:
         {{- include "imagepullsecret-injector.labels" . | nindent 8 }}
     spec:
-      ttlSecondsAfterFinished: 30
       template:
         spec:
           serviceAccountName: imagepullsecret-injector-cert-gen
@@ -22,12 +21,9 @@ spec:
               image: "{{ .Values.certificateGeneratorImage.registry }}/{{ .Values.certificateGeneratorImage.repository }}:{{ .Values.certificateGeneratorImage.tag | default .Chart.AppVersion }}"
               command: ["/entrypoint/entrypoint.sh"]
               args:
-                - --service
+                - --service "{{ include "imagepullsecret-injector.serviceName" . }}"
-                - "{{ include "imagepullsecret-injector.serviceName" . }}"
+                - --namespace "{{ .Release.Namespace }}"
-                - --namespace
+                - --secret "{{ include "imagepullsecret-injector.certificateSecretName" . }}"
-                - "{{ .Release.Namespace }}"
-                - --secret
-                - "{{ include "imagepullsecret-injector.certificateSecretName" . }}"
               volumeMounts:
                 - mountPath: "/entrypoint"
                   name: entrypoint

helm/imagepullsecret-injector/templates/certificate-gen/job-certificate-gen.yaml

@@ -1,11 +1,10 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "{{ .Release.Name }}-cert-gen-job"
+  name: "{{ .Release.Name }}"
   labels:
     {{- include "imagepullsecret-injector.labels" . | nindent 4 }}
 spec:
-  ttlSecondsAfterFinished: 30
   template:
     spec:
       serviceAccountName: imagepullsecret-injector-cert-gen
@@ -15,12 +14,9 @@ spec:
           image: "{{ .Values.certificateGeneratorImage.registry }}/{{ .Values.certificateGeneratorImage.repository }}:{{ .Values.certificateGeneratorImage.tag | default .Chart.AppVersion }}"
           command: ["/entrypoint/entrypoint.sh"]
           args:
-            - --service
+            - --service "{{ include "imagepullsecret-injector.serviceName" . }}"
-            - "{{ include "imagepullsecret-injector.serviceName" . }}"
+            - --namespace "{{ .Release.Namespace }}"
-            - --namespace
+            - --secret "{{ include "imagepullsecret-injector.certificateSecretName" . }}"
-            - "{{ .Release.Namespace }}"
-            - --secret
-            - "{{ include "imagepullsecret-injector.certificateSecretName" . }}"
           volumeMounts:
             - mountPath: "/entrypoint"
               name: entrypoint

helm/imagepullsecret-injector/templates/certificate-gen/rbac-certificate-gen.yaml

@@ -30,16 +30,15 @@ rules:
       - list
       - get
   - apiGroups:
-      - certificates.k8s.io
+      - "certificates.k8s.io/v1"
     resources:
       - certificatesigningrequests
     verbs:
       - create
       - list
       - get
-      - delete
   - apiGroups:
-      - certificates.k8s.io
+      - "certificates.k8s.io/v1"
     resources:
       - certificatesigningrequests/approval
     verbs:

helm/imagepullsecret-injector/templates/mutatingwebhook.yaml

@@ -21,5 +21,3 @@ webhooks:
     resources: ["serviceaccounts"]
   admissionReviewVersions: ["v1", "v1beta1"]
   sideEffects: None
-  # The default "Fail" option prevents Gardener cluster to be hibernated
-  failurePolicy: Ignore

helm/imagepullsecret-injector/templates/rbac.yaml

@@ -25,7 +25,6 @@ rules:
       - create
       - get
       - delete
-      - update
   - apiGroups:
       - ""
     resources:

helm/imagepullsecret-injector/values.yaml

@@ -1,12 +1,12 @@
 image:
-  registry: ghcr.io/ysoftdevs/imagepullsecret-injector
+  registry: marshallmarshall
   repository: imagepullsecret-injector
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 certificateGeneratorImage:
-  registry: ghcr.io/ysoftdevs/imagepullsecret-injector
+  registry: marshallmarshall
   repository: webhook-cert-generator
   tag: ""