Fix typo

isindir · Jan 12, 2024 · 5f3651d · 5f3651d
1 parent 770460c
commit 5f3651d
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 108 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: release-development
+name: ci-development
 on:
   workflow_dispatch:
   push:
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
 
-    name: Release
+    name: CI
     environment: ci-cd
     runs-on: ubuntu-20.04
     env:
@@ -38,15 +38,6 @@ jobs:
       #      sudo apt install -f
       #      sudo apt-get install gnupg2 -y
       #      sudo apt-get install qemu-user-static -y
-      #- name: install buildx
-      #  run: |
-      #      mkdir -p ~/.docker/cli-plugins
-      #      curl -sSLo docker-buildx https://github.com/docker/buildx/releases/download/v${BUILDX_BINARY_VERSION}/buildx-v${BUILDX_BINARY_VERSION}.linux-amd64
-      #      chmod a+x docker-buildx
-      #      mv docker-buildx ~/.docker/cli-plugins/docker-buildx
-      #      docker buildx install
-      #      # Run binfmt
-      #      docker run --rm --privileged tonistiigi/binfmt:latest --install "linux/amd64,linux/arm64"
       #- name: install hub
       #  run: |
       #      curl -sSLO https://github.com/github/hub/releases/download/v${HUB_VERSION}/hub-linux-amd64-${HUB_VERSION}.tgz
@@ -176,6 +167,16 @@ jobs:
       #        exit 1
       #      fi
       #      rm -fr $GNUPGHOME
+      - name: Set Variable
+        id: set_variable
+        run: |
+            echo "IMAGE_FULL_NAME=$(make image_full_name)" >> $GITHUB_ENV
+            echo "IMAGE_LATEST_NAME=$(make image_latest_name)" >> $GITHUB_ENV
+
+      - name: Display Variable
+        run: |
+            echo "Value from Set Variable step: $IMAGE_FULL_NAME"
+            echo "Value from Set Variable step: $IMAGE_LATEST_NAME"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -192,6 +193,9 @@ jobs:
       - name: Docker build
         uses: docker/build-push-action@v5
         with:
-          tags: isindir/sops-secrets-operator:latest
-          platforms: linux/amd64,linux/arm64
+          context: .
           push: false
+          tags: ${{ steps.set_variable.outputs.IMAGE_LATEST_NAME }},${{ steps.set_variable.outputs.IMAGE_FULL_NAME }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=registry,ref=isindir/sops-secrets-operator:cache
+          cache-to: type=registry,ref=isindir/sops-secrets-operator:cache,mode=max
diff --git a/Makefile b/Makefile
@@ -71,6 +71,23 @@ clean: ## Cleans dependency directories.
 	rm -fr ./bin
 	rm -f $(TMP_COVER_HTML_FILE) $(TMP_COVER_FILE)
 
+
+.PHONY: image_tag
+image_tag: ## Prints out image tag set in Makefile
+	@echo ${SOPS_SEC_OPERATOR_VERSION}
+
+.PHONY: image_name
+image_name: ## Prints out image name set in Makefile
+	@echo ${IMG_NAME}
+
+.PHONY: image_full_name
+image_full_name: ## Prints out image full name set in Makefile
+	@echo ${IMG}
+
+.PHONY: image_latest_name
+image_latest_name: ## Prints out image latest name set in Makefile
+	@echo ${IMG_LATEST}
+
 .PHONY: tidy
 tidy: ## Fetches all go dependencies.
 	$(GO) mod tidy

diff --git a/chart/helm3/sops-secrets-operator/README.md b/chart/helm3/sops-secrets-operator/README.md
@@ -138,7 +138,7 @@ The following table lists the configurable parameters of the Sops-secrets-operat
 | imagePullSecrets | list | `[]` | Secrets to pull image from private docker repository |
 | initImage.pullPolicy | string | `"Always"` | Init container image pull policy |
 | initImage.repository | string | `"ubuntu"` | Init container image name |
-| initImage.tag | string | `"lunar-20231128"` | Init container image tag |
+| initImage.tag | string | `"noble-20231221"` | Init container image tag |
 | kubeconfig | object | `{"enabled":false,"path":null}` | Paths to a kubeconfig. Only required if out-of-cluster. |
 | logging | object | `{"development":false,"encoder":"json","level":"info","stacktraceLevel":"error","timeEncoding":"iso8601"}` | Logging configuration section suggested values Development Mode (encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn). Production Mode (encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error) (default) |
 | logging.development | bool | `false` | Zap Development Mode enabled |

diff --git a/chart/helm3/sops-secrets-operator/tests/operator_test.yaml b/chart/helm3/sops-secrets-operator/tests/operator_test.yaml
@@ -198,7 +198,7 @@ tests:
       - equal:
           path: spec.template.spec.initContainers[0].image
           # UPDATE_HERE
-          value: ubuntu:lunar-20231128
+          value: ubuntu:noble-20231221
       - equal:
           path: spec.template.spec.initContainers[0].imagePullPolicy
           value: Always

diff --git a/chart/helm3/sops-secrets-operator/values.yaml b/chart/helm3/sops-secrets-operator/values.yaml
@@ -22,7 +22,7 @@ initImage:
   # -- Init container image name
   repository: ubuntu
   # -- Init container image tag
-  tag: lunar-20231128
+  tag: noble-20231221
   # -- Init container image pull policy
   pullPolicy: Always