chore: several minor updates, bump helm, base-plugins and backup base…

… img (#865)
jenkinsci · Jun 26, 2023 · 0abc758 · 0abc758
1 parent 97892a4
commit 0abc758
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/release-backup.yaml b/.github/workflows/release-backup.yaml
@@ -43,7 +43,6 @@ jobs:
         run: |
           make -C backup/pvc sembump
           make -C backup/pvc bump-version
-          rm backup/pvc/bin/sembump
 
       - name: Login to Quay.io
         if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
@@ -57,5 +56,6 @@ jobs:
         if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
         run: |
           git reset --hard
+          rm bin/sembump
           make -C backup/pvc docker-build
           make -C backup/pvc docker-release
diff --git a/backup/pvc/Dockerfile b/backup/pvc/Dockerfile
@@ -1,12 +1,12 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 LABEL maintainer="Jenkins Kubernetes Operator Community" \
       org.opencontainers.image.authors="Jenkins Kubernetes Operator Community" \
       org.opencontainers.image.title="backup-pvc" \
       org.opencontainers.image.description="Jenkins Operator Backup img via pvc volume" \
       org.opencontainers.image.url="quay.io/jenkins-kubernetes-operator/backup-pvc" \
       org.opencontainers.image.source="https://github.com/jenkinsci/kubernetes-operator/tree/master/backup/pvc" \
-      org.opencontainers.image.base.name="debian:bullseye-slim"
+      org.opencontainers.image.base.name="debian:bookworm-slim"
 
 ARG UID
 ARG GID
@@ -24,9 +24,9 @@ RUN apt update \
     --uid "$UID" \
     "$USER"
 
+COPY bin/*.sh /home/user/bin/
+RUN chmod +x /home/user/bin/*.sh
 WORKDIR /home/user/bin
-COPY bin .
-RUN chmod +x *.sh
 USER user
 
 CMD ./run.sh
diff --git a/backup/pvc/Makefile b/backup/pvc/Makefile
@@ -151,7 +151,6 @@ bump-version: sembump ## Bump the version in the version file. Set BUMP to [ pat
 	echo $(NEW_VERSION) > VERSION.txt
 	git add VERSION.txt
 	git commit -avm "Bump backup PVC version to $(NEW_VERSION)"
-	rm $(PROJECT_DIR)/bin/sembump
 
 .PHONY: tag
 tag: ## Create a new git tag to prepare to build a release

diff --git a/backup/pvc/VERSION.txt b/backup/pvc/VERSION.txt
@@ -1 +1 @@
-v0.2.4
+v0.2.5
diff --git a/config.base.env b/config.base.env
@@ -11,7 +11,7 @@ API_VERSION_NEXT=v1alpha3
 ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one
 GEN_CRD_API=gen-crd-api-reference-docs
 IMAGE_PULL_MODE=local
-HELM_VERSION=3.1.2
+HELM_VERSION=3.12.1
 CLUSTER_DOMAIN=cluster.local
 LATEST_LTS_VERSION=2.401.1
 KIND_CLUSTER_NAME=jenkins
diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go
@@ -2,10 +2,10 @@ package plugins
 
 const (
 	configurationAsCodePlugin           = "configuration-as-code:1647.ve39ca_b_829b_42"
-	gitPlugin                           = "git:5.0.2"
+	gitPlugin                           = "git:5.1.0"
 	jobDslPlugin                        = "job-dsl:1.84"
-	kubernetesPlugin                    = "kubernetes:3937.vd7b_82db_e347b_"
-	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c"
+	kubernetesPlugin                    = "kubernetes:3952.v88e3b_0cf300b_"
+	kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.225.v14f9e6b_28f53"
 	workflowAggregatorPlugin            = "workflow-aggregator:596.v8c21c963d92d"
 	workflowJobPlugin                   = "workflow-job:1308.v58d48a_763b_31"
 )

diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go
@@ -25,9 +25,9 @@ const e2e = "e2e"
 
 var expectedBasePluginsList = []plugins.Plugin{
 	plugins.Must(plugins.New("configuration-as-code:1647.ve39ca_b_829b_42")),
-	plugins.Must(plugins.New("git:5.0.2")),
-	plugins.Must(plugins.New("kubernetes:3937.vd7b_82db_e347b_")),
-	plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")),
+	plugins.Must(plugins.New("git:5.1.0")),
+	plugins.Must(plugins.New("kubernetes:3952.v88e3b_0cf300b_")),
+	plugins.Must(plugins.New("kubernetes-credentials-provider:1.225.v14f9e6b_28f53")),
 	plugins.Must(plugins.New("job-dsl:1.84")),
 	plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")),
 	plugins.Must(plugins.New("workflow-job:1308.v58d48a_763b_31")),