Bump the chart version

.github/workflows/release-docker.yaml

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

Makefile

@@ -1,7 +1,8 @@
 # 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.
-IMAGE_REPO ?= marshallmarshall
+REPOSITORY_BASE ?= ghcr.io
+IMAGE_REPO ?= $(REPOSITORY_BASE)/ysoftdevs/imagepullsecret-injector
 IMAGE_NAME ?= imagepullsecret-injector
 GENERATOR_IMAGE_NAME ?= webhook-cert-generator
 
@@ -81,7 +82,7 @@ build-linux:
 image: docker-login build-image push-image
 
 docker-login:
-	@echo ${DOCKER_TOKEN} | docker login -u ${DOCKER_USER} --password-stdin
+	@echo "$(DOCKER_TOKEN)" | docker login -u "$(DOCKER_USER)" --password-stdin "$(REPOSITORY_BASE)"
 
 docker-logout:
 	@docker logout

README.md

@@ -2,6 +2,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
+- `ghcr.io/ysoftdevs/imagepullsecret-injector/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.
 
@@ -21,22 +25,38 @@ The main part is the deployment and the web hook configuration. The flow is as f
 Of note is also a fact that the chart runs a lookup to the connected cluster to fetch the CA bundle for the MutatingWebhook. This means `helm template` won't work.
 
 ## Running locally
-```bash
+1. Create the prerequisite resources:
-kubectl create ns imagepullsecret-injector
+    ```bash
+    kubectl create ns imagepullsecret-injector
 
-kubectl create secret -n imagepullsecret-injector \
+    kubectl create secret -n imagepullsecret-injector \
-    generic my-cool-secret-source \
+        generic acr-dockerconfigjson-source \
-    --from-literal=.dockerconfigjson='<your .dockerconfigjson configuration file>'
+        --type=kubernetes.io/dockerconfigjson \
+        --from-literal=.dockerconfigjson='<your .dockerconfigjson configuration file>'
+    ```
 
-make build-image
+1. Build the images and run the chart
-helm upgrade -i imagepullsecret-injector \
+    ``` bash
-    --create-namespace -n imagepullsecret-injector \
+    make build-image
-    helm/imagepullsecret-injector
+    helm upgrade -i imagepullsecret-injector \
-```
+        -n imagepullsecret-injector \
+        helm/imagepullsecret-injector
+    ```
+    Alternatively, you can use the pre-built, publicly available helm chart and docker images:
+    ```bash
+    helm repo add imagepullsecret-injector https://ysoftdevs.github.io/imagepullsecret-injector
+    helm repo update
+    helm upgrade -i imagepullsecret-injector \
+        -n imagepullsecret-injector \
+        magepullsecret-injector/imagepullsecret-injector
+    ```
 
-To test whether everything works, you can run
+1. To test whether everything works, you can run
-```bash
+    ```bash
-kubectl create ns yolo
+    kubectl create ns yolo
-kubectl get sa -n yolo default -ojsonpath='{.imagePullSecrets}'
+    kubectl get sa -n yolo default -ojsonpath='{.imagePullSecrets}'
-```
+    ```
-The get command should display _some_ non-empty result.
+    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 @@
-v0.0.8
+0.0.9

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.6
+version: 0.0.16
 
 # 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: v0.0.8
+appVersion: 0.0.9

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

@@ -89,6 +89,7 @@ apiVersion: certificates.k8s.io/v1
 kind: CertificateSigningRequest
 metadata:
   name: ${csrName}
+  namespace: ${namespace}
 spec:
   signerName: kubernetes.io/kubelet-serving
   groups:

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

@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "imagepullsecret-injector.labels" . | nindent 4 }}
 spec:
-  schedule: '* * * * *'
+  schedule: '* * * * 0'
   jobTemplate:
     metadata:
       name: "{{ .Release.Name }}"
@@ -21,9 +21,12 @@ spec:
               image: "{{ .Values.certificateGeneratorImage.registry }}/{{ .Values.certificateGeneratorImage.repository }}:{{ .Values.certificateGeneratorImage.tag | default .Chart.AppVersion }}"
               command: ["/entrypoint/entrypoint.sh"]
               args:
-                - --service="{{ include "imagepullsecret-injector.serviceName" . }}"
+                - --service
-                - --namespace="{{ .Release.Namespace }}"
+                - "{{ include "imagepullsecret-injector.serviceName" . }}"
-                - --secret="{{ include "imagepullsecret-injector.certificateSecretName" . }}"
+                - --namespace
+                - "{{ .Release.Namespace }}"
+                - --secret
+                - "{{ include "imagepullsecret-injector.certificateSecretName" . }}"
               volumeMounts:
                 - mountPath: "/entrypoint"
                   name: entrypoint

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

@@ -14,9 +14,12 @@ spec:
           image: "{{ .Values.certificateGeneratorImage.registry }}/{{ .Values.certificateGeneratorImage.repository }}:{{ .Values.certificateGeneratorImage.tag | default .Chart.AppVersion }}"
           command: ["/entrypoint/entrypoint.sh"]
           args:
-            - --service="{{ include "imagepullsecret-injector.serviceName" . }}"
+            - --service
-            - --namespace="{{ .Release.Namespace }}"
+            - "{{ include "imagepullsecret-injector.serviceName" . }}"
-            - --secret="{{ include "imagepullsecret-injector.certificateSecretName" . }}"
+            - --namespace
+            - "{{ .Release.Namespace }}"
+            - --secret
+            - "{{ include "imagepullsecret-injector.certificateSecretName" . }}"
           volumeMounts:
             - mountPath: "/entrypoint"
               name: entrypoint

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

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

helm/imagepullsecret-injector/templates/mutatingwebhook.yaml

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

helm/imagepullsecret-injector/values.yaml

@@ -1,21 +1,21 @@
 image:
-  registry: marshallmarshall
+  registry: ghcr.io/ysoftdevs/imagepullsecret-injector
   repository: imagepullsecret-injector
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 certificateGeneratorImage:
-  registry: marshallmarshall
+  registry: ghcr.io/ysoftdevs/imagepullsecret-injector
   repository: webhook-cert-generator
   tag: ""
 
 imagepullsecretInjector:
   dockerconfigjsonRef:
-    secretName: my-cool-secret-source
+    secretName: acr-dockerconfigjson-source
     secretNamespace: ""
 
-  targetSecretName: my-cool-secret
+  targetSecretName: acr-dockerconfigjson
   ignoreSecretCreationError: false
   allSaNames: false
   saNames: