Skip to content

Commit 76078d5

Browse files
SylwiaBrantSylwiaBrant
committed
Bump version to v0.7.0
1 parent e2f1945 commit 76078d5

File tree

13 files changed

+27
-77
lines changed

13 files changed

+27
-77
lines changed

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ HAS_SEMBUMP := $(shell which $(PROJECT_DIR)/bin/sembump)
346346
sembump: # Download sembump locally if necessary
347347
@echo "+ $@"
348348
ifndef HAS_SEMBUMP
349-
mkdir bin
349+
mkdir -p $(PROJECT_DIR)/bin
350350
wget -O $(PROJECT_DIR)/bin/sembump https://github.com/justintout/sembump/releases/download/v0.1.0/sembump-$(PLATFORM)-amd64
351351
chmod +x $(PROJECT_DIR)/bin/sembump
352352
endif
@@ -360,8 +360,9 @@ bump-version: sembump ## Bump the version in the version file. Set BUMP to [ pat
360360
echo $(NEW_VERSION) > VERSION.txt
361361
@echo "Updating version from $(VERSION) to $(NEW_VERSION) in README.md"
362362
sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' README.md
363-
sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/operator.yaml
363+
sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' config/manager/manager.yaml
364364
sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
365+
rm */*/**.bak
365366
rm */**.bak
366367
rm *.bak
367368
cp config/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Jenkins Operator
22

3-
[![Version](https://img.shields.io/badge/version-v0.6.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.6.0)
3+
[![Version](https://img.shields.io/badge/version-v0.7.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.7.0)
44
[![Build status](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests.yaml/badge.svg)](https://github.com/jenkinsci/kubernetes-operator/actions/workflows/auto-tests.yaml)
55
[![Go Report Card](https://goreportcard.com/badge/github.com/jenkinsci/kubernetes-operator "Go Report Card")](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator)
66
[![Docker Pulls](https://img.shields.io/docker/pulls/virtuslab/jenkins-operator.svg)](https://hub.docker.com/r/virtuslab/jenkins-operator/tags)

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.6.0
1+
v0.7.0

‎api/v1alpha2/jenkins_types.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,19 +347,19 @@ type JenkinsMaster struct {
347347
// +optional
348348
// Defaults to :
349349
// - name: kubernetes
350-
// version: "1.29.6"
350+
// version: "1.30.11"
351351
// - name: workflow-job
352-
// version: "2.41"
352+
// version: "2.42"
353353
// - name: workflow-aggregator
354354
// version: "2.6"
355355
// - name: git
356-
// version: "4.7.2"
356+
// version: "4.10.0"
357357
// - name: job-dsl
358-
// version: "1.77"
358+
// version: "1.78.1"
359359
// - name: configuration-as-code
360-
// version: "1.51"
360+
// version: "1.55"
361361
// - name: kubernetes-credentials-provider
362-
// version: "0.18-1"
362+
// version: "0.20"
363363
BasePlugins []Plugin `json:"basePlugins,omitempty"`
364364

365365
// Plugins contains plugins required by user

‎config/crd/bases/jenkins.io_jenkins.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ spec:
157157
type: object
158158
basePlugins:
159159
description: 'BasePlugins contains plugins required by operator
160-
Defaults to : - name: kubernetes version: "1.29.6" - name: workflow-job
161-
version: "2.41" - name: workflow-aggregator version: "2.6" -
162-
name: git version: "4.7.2" - name: job-dsl version: "1.77" -
163-
name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider
164-
version: "0.18-1"'
160+
Defaults to : - name: kubernetes version: "1.30.11" - name:
161+
workflow-job version: "2.42" - name: workflow-aggregator version:
162+
"2.6" - name: git version: "4.10.0" - name: job-dsl version:
163+
"1.78.1" - name: configuration-as-code version: "1.55" - name:
164+
kubernetes-credentials-provider version: "0.20"'
165165
items:
166166
description: Plugin defines Jenkins plugin.
167167
properties:

‎config/manager/manager.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: jenkins-operator
6-
namespace: default
76
labels:
87
control-plane: controller-manager
98
spec:
@@ -24,7 +23,7 @@ spec:
2423
- /manager
2524
args:
2625
- --leader-elect
27-
image: virtuslab/jenkins-operator:v0.5.0
26+
image: virtuslab/jenkins-operator:v0.7.0
2827
name: jenkins-operator
2928
imagePullPolicy: IfNotPresent
3029
securityContext:

‎config/samples/jenkins.io_v1alpha2_jenkins.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
disableCSRFProtection: false
2020
containers:
2121
- name: jenkins-master
22-
image: jenkins/jenkins:2.303.2-lts-alpine
22+
image: jenkins/jenkins:2.319.1-lts-alpine
2323
imagePullPolicy: Always
2424
livenessProbe:
2525
failureThreshold: 12

‎deploy/all-in-one-v1alpha2.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ spec:
246246
- /manager
247247
args:
248248
- --leader-elect
249-
image: virtuslab/jenkins-operator:v0.6.0
249+
image: virtuslab/jenkins-operator:v0.7.0
250250
name: jenkins-operator
251251
imagePullPolicy: IfNotPresent
252252
securityContext:

‎pkg/plugins/base_plugins.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package plugins
22

33
const (
4-
configurationAsCodePlugin = "configuration-as-code:1.54"
5-
gitPlugin = "git:4.9.0"
6-
jobDslPlugin = "job-dsl:1.77"
4+
configurationAsCodePlugin = "configuration-as-code:1.55"
5+
gitPlugin = "git:4.10.0"
6+
jobDslPlugin = "job-dsl:1.78.1"
77
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.20"
8-
kubernetesPlugin = "kubernetes:1.30.4"
8+
kubernetesPlugin = "kubernetes:1.30.11"
99
workflowAggregatorPlugin = "workflow-aggregator:2.6"
1010
workflowJobPlugin = "workflow-job:2.42"
1111
)

‎test/e2e/jenkins_configuration_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ var _ = Describe("Jenkins controller configuration", func() {
8585
})
8686

8787
AfterEach(func() {
88+
ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
8889
DestroyNamespace(namespace)
8990
})
9091

@@ -185,6 +186,7 @@ var _ = Describe("Jenkins controller plugins test", func() {
185186
})
186187

187188
AfterEach(func() {
189+
ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
188190
DestroyNamespace(namespace)
189191
})
190192

0 commit comments

Comments
 (0)