public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: several minor updates, bump helm, base-plugins and backup base img (#865)

This commit is contained in:
Luigi Operoso 2023-06-26 12:43:24 +02:00 committed by GitHub
parent 97892a4cbd
commit 0abc758dc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release-backup.yaml vendored
View File

@ -43,7 +43,6 @@ jobs:
run: | run: |
make -C backup/pvc sembump make -C backup/pvc sembump
make -C backup/pvc bump-version make -C backup/pvc bump-version
rm backup/pvc/bin/sembump
- name: Login to Quay.io - name: Login to Quay.io
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' 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' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
run: | run: |
git reset --hard git reset --hard
rm bin/sembump
make -C backup/pvc docker-build make -C backup/pvc docker-build
make -C backup/pvc docker-release make -C backup/pvc docker-release

8
backup/pvc/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:bullseye-slim FROM debian:bookworm-slim
LABEL maintainer="Jenkins Kubernetes Operator Community" \ LABEL maintainer="Jenkins Kubernetes Operator Community" \
org.opencontainers.image.authors="Jenkins Kubernetes Operator Community" \ org.opencontainers.image.authors="Jenkins Kubernetes Operator Community" \
@ -6,7 +6,7 @@ LABEL maintainer="Jenkins Kubernetes Operator Community" \
org.opencontainers.image.description="Jenkins Operator Backup img via pvc volume" \ 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.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.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 UID
ARG GID ARG GID
@ -24,9 +24,9 @@ RUN apt update \
--uid "$UID" \ --uid "$UID" \
"$USER" "$USER"
COPY bin/*.sh /home/user/bin/
RUN chmod +x /home/user/bin/*.sh
WORKDIR /home/user/bin WORKDIR /home/user/bin
COPY bin .
RUN chmod +x *.sh
USER user USER user
CMD ./run.sh CMD ./run.sh

1
backup/pvc/Makefile
View File

@ -151,7 +151,6 @@ bump-version: sembump ## Bump the version in the version file. Set BUMP to [ pat
echo $(NEW_VERSION) > VERSION.txt echo $(NEW_VERSION) > VERSION.txt
git add VERSION.txt git add VERSION.txt
git commit -avm "Bump backup PVC version to $(NEW_VERSION)" git commit -avm "Bump backup PVC version to $(NEW_VERSION)"
rm $(PROJECT_DIR)/bin/sembump
.PHONY: tag .PHONY: tag
tag: ## Create a new git tag to prepare to build a release tag: ## Create a new git tag to prepare to build a release

2
backup/pvc/VERSION.txt
View File

@ -1 +1 @@
v0.2.4 v0.2.5

2
config.base.env
View File

@ -11,7 +11,7 @@ API_VERSION_NEXT=v1alpha3
ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one
GEN_CRD_API=gen-crd-api-reference-docs GEN_CRD_API=gen-crd-api-reference-docs
IMAGE_PULL_MODE=local IMAGE_PULL_MODE=local
HELM_VERSION=3.1.2 HELM_VERSION=3.12.1
CLUSTER_DOMAIN=cluster.local CLUSTER_DOMAIN=cluster.local
LATEST_LTS_VERSION=2.401.1 LATEST_LTS_VERSION=2.401.1
KIND_CLUSTER_NAME=jenkins KIND_CLUSTER_NAME=jenkins

6
pkg/plugins/base_plugins.go
View File

@ -2,10 +2,10 @@ package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1647.ve39ca_b_829b_42" configurationAsCodePlugin = "configuration-as-code:1647.ve39ca_b_829b_42"
gitPlugin = "git:5.0.2" gitPlugin = "git:5.1.0"
jobDslPlugin = "job-dsl:1.84" jobDslPlugin = "job-dsl:1.84"
kubernetesPlugin = "kubernetes:3937.vd7b_82db_e347b_" kubernetesPlugin = "kubernetes:3952.v88e3b_0cf300b_"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.225.v14f9e6b_28f53"
workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d" workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d"
workflowJobPlugin = "workflow-job:1308.v58d48a_763b_31" workflowJobPlugin = "workflow-job:1308.v58d48a_763b_31"
) )

6
test/e2e/configuration_test.go
View File

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