Bump version to v0.6.0

Makefile

@@ -358,16 +358,18 @@ bump-version: sembump ## Bump the version in the version file. Set BUMP to [ pat
 	@echo "Bumping VERSION.txt from $(VERSION) to $(NEW_VERSION)"
 	echo $(NEW_VERSION) > VERSION.txt
 	@echo "Updating version from $(VERSION) to $(NEW_VERSION) in README.md"
-	sed -i s/$(VERSION)/$(NEW_VERSION)/g README.md
-	sed -i s/$(VERSION)/$(NEW_VERSION)/g deploy/operator.yaml
-	sed -i s/$(VERSION)/$(NEW_VERSION)/g deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' README.md
+	sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/operator.yaml
+	sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	rm */**.bak
+	rm *.bak
 	cp config/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
-	cat config/rbac/leader_election_role.yaml >> config/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
-	cat config/rbac/leader_election_role_binding.yaml >> config/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)=$(API_VERSION).yaml
-	cat config/rbac/role.yaml >> config/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)=$(API_VERSION).yaml
-	cat config/rbac/role_binding.yaml >> config/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
-	cat config/manager/manager.yaml >> config/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
-	git add VERSION.txt README.md config/manager/manager.yaml config/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	cat config/rbac/leader_election_role.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	cat config/rbac/leader_election_role_binding.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	cat config/rbac/role.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	cat config/rbac/role_binding.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	cat config/manager/manager.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
+	git add VERSION.txt README.md config/manager/manager.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
 	git commit -vaem "Bump version to $(NEW_VERSION)"
 	@echo "Run make tag to create and push the tag for new version $(NEW_VERSION)"
 
@@ -439,18 +441,6 @@ generate-docs: hugo ## Re-generate docs directory from the website directory
 	cd website && npm install
 	$(HUGO_PATH)/hugo -s website -d ../docs
 
-.PHONY: all-in-one-build
-FILENAME := config/all_in_one_$(API_VERSION).yaml
-all-in-one-build: ## Re-generate all-in-one yaml
-	@echo "+ $@"
-	> $(FILENAME)
-	cat config/service_account.yaml >> $(FILENAME)
-	cat config/rbac/leader_election_role.yaml >> $(FILENAME)
-	cat config/rbac/leader_election_role_binding.yaml >> $(FILENAME)
-	cat config/rbac/role.yaml >> $(FILENAME)
-	cat config/rbac/role_binding.yaml >> $(FILENAME)
-	cat config/manager/manager.yaml >> $(FILENAME)
-
 ##################### FROM OPERATOR SDK ########################
 # Install CRDs into a cluster
 install-crds: manifests kustomize
@@ -470,7 +460,7 @@ undeploy:
 	$(KUSTOMIZE) build config/default | kubectl delete -f -
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: controller-gen all-in-one-build
+manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 # Generate code

README.md

@@ -1,6 +1,6 @@
 # Jenkins Operator
 
-[![Version](https://img.shields.io/badge/version-v0.5.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.5.0)
+[![Version](https://img.shields.io/badge/version-v0.6.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.6.0)
 [![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)
 [![Go Report Card](https://goreportcard.com/badge/github.com/jenkinsci/kubernetes-operator "Go Report Card")](https://goreportcard.com/report/github.com/jenkinsci/kubernetes-operator)
 [![Docker Pulls](https://img.shields.io/docker/pulls/virtuslab/jenkins-operator.svg)](https://hub.docker.com/r/virtuslab/jenkins-operator/tags)

VERSION.txt

@@ -1 +1 @@
-v0.5.0
+v0.6.0

api/v1alpha2/jenkins_types.go

@@ -343,13 +343,13 @@ type JenkinsMaster struct {
 	// +optional
 	// Defaults to :
 	// - name: kubernetes
-	// version: "1.29.4"
+	// version: "1.29.6"
 	// - name: workflow-job
-	// version: "2.40"
+	// version: "2.41"
 	// - name: workflow-aggregator
 	// version: "2.6"
 	// - name: git
-	// version: "4.6.0"
+	// version: "4.7.2"
 	// - name: job-dsl
 	// version: "1.77"
 	// - name: configuration-as-code

chart/jenkins-operator/crds/jenkins-crd.yaml

@@ -5,7 +5,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
-  creationTimestamp: null
   name: jenkins.jenkins.io
 spec:
   group: jenkins.io
@@ -157,9 +156,9 @@ spec:
                       type: object
                     basePlugins:
                       description: 'BasePlugins contains plugins required by operator
-                      Defaults to : - name: kubernetes version: "1.29.4" - name: workflow-job
-                      version: "2.40" - name: workflow-aggregator version: "2.6" -
-                      name: git version: "4.6.0" - name: job-dsl version: "1.77" -
+                      Defaults to : - name: kubernetes version: "1.29.6" - name: workflow-job
+                      version: "2.41" - name: workflow-aggregator version: "2.6" -
+                      name: git version: "4.7.2" - name: job-dsl version: "1.77" -
                       name: configuration-as-code version: "1.51" - name: kubernetes-credentials-provider
                       version: "0.18-1"'
                       items:

chart/jenkins-operator/values.yaml

@@ -63,34 +63,20 @@ jenkins:
   #
   # basePlugins:
   # - name: kubernetes
-  #   version: 1.29.4
+  #   version: 1.29.6
   # - name: workflow-job
-  #   version: "2.40"
+  #   version: "2.41"
   # - name: workflow-aggregator
   #   version: "2.6"
   # - name: git
-  #   version: 4.6.0
+  #   version: 4.7.2
   # - name: job-dsl
   #   version: "1.77"
   # - name: configuration-as-code
   #   version: "1.51"
   # - name: kubernetes-credentials-provider
   #   version: 0.18-1
-  basePlugins:
-    - name: kubernetes
-      version: "1.29.4"
-    - name: workflow-job
-      version: "2.40"
-    - name: workflow-aggregator
-      version: "2.6"
-    - name: git
-      version: "4.6.0"
-    - name: job-dsl
-      version: "1.77"
-    - name: configuration-as-code
-      version: "1.51"
-    - name: kubernetes-credentials-provider
-      version: "0.18-1"
+  basePlugins: []
 
   # plugins are plugins required by the user
   # You can define plugins here