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

Bump version to v0.7.0

This commit is contained in:
Sylwia Brant 2021-12-08 10:26:46 +01:00
parent e2f19454b1
commit 76078d5ff2
13 changed files with 27 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -346,7 +346,7 @@ HAS_SEMBUMP := $(shell which $(PROJECT_DIR)/bin/sembump)
sembump: # Download sembump locally if necessary
@echo "+ $@"
ifndef HAS_SEMBUMP
mkdir bin
mkdir -p $(PROJECT_DIR)/bin
wget -O $(PROJECT_DIR)/bin/sembump https://github.com/justintout/sembump/releases/download/v0.1.0/sembump-$(PLATFORM)-amd64
chmod +x $(PROJECT_DIR)/bin/sembump
endif
@ -360,8 +360,9 @@ bump-version: sembump ## Bump the version in the version file. Set BUMP to [ pat
echo $(NEW_VERSION) > VERSION.txt
@echo "Updating version from $(VERSION) to $(NEW_VERSION) in README.md"
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' config/manager/manager.yaml
sed -i.bak 's/$(VERSION)/$(NEW_VERSION)/g' deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml
rm */*/**.bak
rm */**.bak
rm *.bak
cp config/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml

2
README.md
View File

@ -1,6 +1,6 @@
# Jenkins Operator
[![Version](https://img.shields.io/badge/version-v0.6.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.6.0)
[![Version](https://img.shields.io/badge/version-v0.7.0-brightgreen.svg)](https://github.com/jenkinsci/kubernetes-operator/releases/tag/v0.7.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)

2
VERSION.txt
View File

@ -1 +1 @@
v0.6.0
v0.7.0

12
api/v1alpha2/jenkins_types.go
View File

@ -347,19 +347,19 @@ type JenkinsMaster struct {
// +optional
// Defaults to :
// - name: kubernetes
// version: "1.29.6"
// version: "1.30.11"
// - name: workflow-job
// version: "2.41"
// version: "2.42"
// - name: workflow-aggregator
// version: "2.6"
// - name: git
// version: "4.7.2"
// version: "4.10.0"
// - name: job-dsl
// version: "1.77"
// version: "1.78.1"
// - name: configuration-as-code
// version: "1.51"
// version: "1.55"
// - name: kubernetes-credentials-provider
// version: "0.18-1"
// version: "0.20"
BasePlugins []Plugin `json:"basePlugins,omitempty"`
// Plugins contains plugins required by user

10
config/crd/bases/jenkins.io_jenkins.yaml
View File

@ -157,11 +157,11 @@ spec:
type: object
basePlugins:
description: 'BasePlugins contains plugins required by operator
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"'
Defaults to : - name: kubernetes version: "1.30.11" - name:
workflow-job version: "2.42" - name: workflow-aggregator version:
"2.6" - name: git version: "4.10.0" - name: job-dsl version:
"1.78.1" - name: configuration-as-code version: "1.55" - name:
kubernetes-credentials-provider version: "0.20"'
items:
description: Plugin defines Jenkins plugin.
properties:

3
config/manager/manager.yaml
View File

@ -3,7 +3,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: jenkins-operator
namespace: default
labels:
control-plane: controller-manager
spec:
@ -24,7 +23,7 @@ spec:
- /manager
args:
- --leader-elect
image: virtuslab/jenkins-operator:v0.5.0
image: virtuslab/jenkins-operator:v0.7.0
name: jenkins-operator
imagePullPolicy: IfNotPresent
securityContext:

2
config/samples/jenkins.io_v1alpha2_jenkins.yaml
View File

@ -19,7 +19,7 @@ spec:
disableCSRFProtection: false
containers:
- name: jenkins-master
image: jenkins/jenkins:2.303.2-lts-alpine
image: jenkins/jenkins:2.319.1-lts-alpine
imagePullPolicy: Always
livenessProbe:
failureThreshold: 12

2
deploy/all-in-one-v1alpha2.yaml
View File

@ -246,7 +246,7 @@ spec:
- /manager
args:
- --leader-elect
image: virtuslab/jenkins-operator:v0.6.0
image: virtuslab/jenkins-operator:v0.7.0
name: jenkins-operator
imagePullPolicy: IfNotPresent
securityContext:

8
pkg/plugins/base_plugins.go
View File

@ -1,11 +1,11 @@
package plugins
const (
configurationAsCodePlugin = "configuration-as-code:1.54"
gitPlugin = "git:4.9.0"
jobDslPlugin = "job-dsl:1.77"
configurationAsCodePlugin = "configuration-as-code:1.55"
gitPlugin = "git:4.10.0"
jobDslPlugin = "job-dsl:1.78.1"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:0.20"
kubernetesPlugin = "kubernetes:1.30.4"
kubernetesPlugin = "kubernetes:1.30.11"
workflowAggregatorPlugin = "workflow-aggregator:2.6"
workflowJobPlugin = "workflow-job:2.42"
)

2
test/e2e/jenkins_configuration_test.go
View File

@ -85,6 +85,7 @@ var _ = Describe("Jenkins controller configuration", func() {
})
AfterEach(func() {
ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
DestroyNamespace(namespace)
})
@ -185,6 +186,7 @@ var _ = Describe("Jenkins controller plugins test", func() {
})
AfterEach(func() {
ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
DestroyNamespace(namespace)
})

1
test/e2e/jenkins_pod_restart_test.go
View File

@ -91,6 +91,7 @@ var _ = Describe("Jenkins controller", func() {
})
AfterEach(func() {
ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
DestroyNamespace(namespace)
})

53
test/e2e/seedjobs_test.go
View File

@ -28,59 +28,6 @@ type seedJobConfig struct {
PrivateKey string `json:"privateKey,omitempty"`
}
/*
type seedJobsConfig struct {
SeedJobs []seedJobConfig `json:"seedJobs,omitempty"`
}
// FIXME
func TestSeedJobs(t *testing.T) {
t.Parallel()
if seedJobConfigurationFile == nil || len(*seedJobConfigurationFile) == 0 {
t.Skipf("Skipping test because flag '%+v' is not set", seedJobConfigurationFile)
}
seedJobsConfig := loadSeedJobsConfig(t)
namespace, ctx := setupTest(t)
defer showLogsAndCleanup(t, ctx)
jenkinsCRName := "e2e"
var seedJobs []v1alpha2.SeedJob
// base
for _, seedJobConfig := range seedJobsConfig.SeedJobs {
createKubernetesCredentialsProviderSecret(t, namespace, seedJobConfig)
seedJobs = append(seedJobs, seedJobConfig.SeedJob)
}
jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, "")
waitForJenkinsBaseConfigurationToComplete(t, jenkins)
verifyJenkinsMasterPodAttributes(t, jenkins)
jenkinsClient, cleanUpFunc := verifyJenkinsAPIConnection(t, jenkins, namespace)
defer cleanUpFunc()
verifyPlugins(t, jenkinsClient, jenkins)
// user
waitForJenkinsUserConfigurationToComplete(t, jenkins)
verifyJenkinsSeedJobs(t, jenkinsClient, seedJobsConfig.SeedJobs)
}
func loadSeedJobsConfig() seedJobsConfig {
//seedJobConfigurationFile = flag.String(seedJobConfigurationParameterName, "", "path to seed job config")
jsonFile, err := os.Open(*seedJobConfigurationFile)
Expect(err).NotTo(HaveOccurred())
defer func() { _ = jsonFile.Close() }()
byteValue, err := ioutil.ReadAll(jsonFile)
Expect(err).NotTo(HaveOccurred())
var result seedJobsConfig
err = json.Unmarshal(byteValue, &result)
Expect(err).NotTo(HaveOccurred())
Expect(result.SeedJobs).NotTo(BeEmpty())
return result
}
*/
func createKubernetesCredentialsProviderSecret(namespace string, config seedJobConfig) {
if config.JenkinsCredentialType == v1alpha2.NoJenkinsCredentialCredentialType {
return

2
test/e2e/test_utility.go
View File

@ -21,7 +21,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest"
)
const JenkinsTestImage = "jenkins/jenkins:2.303.2-lts"
const JenkinsTestImage = "jenkins/jenkins:2.319.1-lts"
var (
Cfg *rest.Config