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

sunday tests investigation

This commit is contained in:
brokenpip3 2024-12-08 23:40:06 +01:00
parent f9ded15841
commit e23fb22ac2
No known key found for this signature in database
GPG Key ID: 1D9BDC803797B4B6
19 changed files with 1868 additions and 1484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -382,6 +382,10 @@ kind-clean: ## Delete kind cluster
@echo "+ $@" @echo "+ $@"
kind delete cluster --name $(KIND_CLUSTER_NAME) kind delete cluster --name $(KIND_CLUSTER_NAME)
.PHONY: kind-revamp
kind-revamp: kind-clean kind-setup## Delete and recreate kind cluster
@echo "+ $@"
.PHONY: bats-tests .PHONY: bats-tests
IMAGE_NAME := quay.io/$(QUAY_ORGANIZATION)/$(QUAY_REGISTRY):$(GITCOMMIT)-amd64 IMAGE_NAME := quay.io/$(QUAY_ORGANIZATION)/$(QUAY_REGISTRY):$(GITCOMMIT)-amd64
BUILD_PRESENT := $(shell docker images |grep -q ${IMAGE_NAME}) BUILD_PRESENT := $(shell docker images |grep -q ${IMAGE_NAME})
@ -555,7 +559,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
.PHONY: envtest .PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN) $(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.17
.PHONY: operator-sdk .PHONY: operator-sdk
HAS_OPERATOR_SDK := $(shell which $(PROJECT_DIR)/bin/operator-sdk) HAS_OPERATOR_SDK := $(shell which $(PROJECT_DIR)/bin/operator-sdk)

1
api/v1alpha2/zz_generated.deepcopy.go
View File

@ -1,5 +1,4 @@
//go:build !ignore_autogenerated //go:build !ignore_autogenerated
// +build !ignore_autogenerated
/* /*
Copyright 2021. Copyright 2021.

4
chart/jenkins-operator/README.md
View File

@ -54,7 +54,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
| jenkins.enabled | bool | `true` | | | jenkins.enabled | bool | `true` | |
| jenkins.env | list | `[]` | | | jenkins.env | list | `[]` | |
| jenkins.hostAliases | object | `{}` | | | jenkins.hostAliases | object | `{}` | |
| jenkins.image | string | `"jenkins/jenkins:2.462.3-lts"` | | | jenkins.image | string | `"jenkins/jenkins:2.479.2-lts"` | |
| jenkins.imagePullPolicy | string | `"Always"` | | | jenkins.imagePullPolicy | string | `"Always"` | |
| jenkins.imagePullSecrets | list | `[]` | | | jenkins.imagePullSecrets | list | `[]` | |
| jenkins.labels | object | `{}` | | | jenkins.labels | object | `{}` | |
@ -112,4 +112,4 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
| webhook.enabled | bool | `false` | | | webhook.enabled | bool | `false` | |
---------------------------------------------- ----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2) Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)

2
chart/jenkins-operator/values.yaml
View File

@ -36,7 +36,7 @@ jenkins:
# image is the name (and tag) of the Jenkins instance # image is the name (and tag) of the Jenkins instance
# Default: jenkins/jenkins:lts # Default: jenkins/jenkins:lts
# It's recommended to use LTS (tag: "lts") version # It's recommended to use LTS (tag: "lts") version
image: jenkins/jenkins:2.462.3-lts image: jenkins/jenkins:2.479.2-lts
# env contains jenkins container environment variables # env contains jenkins container environment variables
env: [] env: []

2
config.base.env
View File

@ -7,7 +7,7 @@ GO_VERSION="1.22"
HELM_VERSION="3.12.3" HELM_VERSION="3.12.3"
IMAGE_PULL_MODE="local" IMAGE_PULL_MODE="local"
KIND_CLUSTER_NAME="jenkins" KIND_CLUSTER_NAME="jenkins"
LATEST_LTS_VERSION="2.462.3" LATEST_LTS_VERSION="2.479.2"
NAME="kubernetes-operator" NAME="kubernetes-operator"
NAMESPACE="default" NAMESPACE="default"
OPERATOR_SDK_VERSION="1.35.0" OPERATOR_SDK_VERSION="1.35.0"

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

File diff suppressed because it is too large Load Diff

1
config/rbac/role.yaml
View File

@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
creationTimestamp: null
name: manager-role name: manager-role
rules: rules:
- apiGroups: - apiGroups:

1
config/webhook/manifests.yaml
View File

@ -2,7 +2,6 @@
apiVersion: admissionregistration.k8s.io/v1 apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
creationTimestamp: null
name: validating-webhook-configuration name: validating-webhook-configuration
webhooks: webhooks:
- admissionReviewVersions: - admissionReviewVersions:

2
internal/controller/jenkins_controller.go
View File

@ -205,7 +205,7 @@ func (r *JenkinsReconciler) Reconcile(_ context.Context, request ctrl.Request) (
return reconcile.Result{Requeue: true}, nil return reconcile.Result{Requeue: true}, nil
} }
if result.Requeue && result.RequeueAfter == 0 { if result.Requeue && result.RequeueAfter == 0 {
result.RequeueAfter = time.Duration(rand.Intn(10)) * time.Millisecond result.RequeueAfter = time.Duration(rand.Intn(10)) * time.Second
} }
return result, nil return result, nil
} }

3
pkg/configuration/base/reconciler.go
View File

@ -121,6 +121,9 @@ func (r *JenkinsBaseConfigurationReconciler) Reconcile() (reconcile.Result, jenk
} }
result, err = r.ensureBaseConfiguration(jenkinsClient) result, err = r.ensureBaseConfiguration(jenkinsClient)
if err != nil {
return reconcile.Result{}, nil, err
}
return result, jenkinsClient, err return result, jenkinsClient, err
} }

2
pkg/constants/constants.go
View File

@ -8,7 +8,7 @@ const (
// SeedJobSuffix is a suffix added for all seed jobs // SeedJobSuffix is a suffix added for all seed jobs
SeedJobSuffix = "job-dsl-seed" SeedJobSuffix = "job-dsl-seed"
// DefaultJenkinsMasterImage is the default Jenkins master docker image // DefaultJenkinsMasterImage is the default Jenkins master docker image
DefaultJenkinsMasterImage = "jenkins/jenkins:2.462.3-lts" DefaultJenkinsMasterImage = "jenkins/jenkins:2.479.2-lts"
// DefaultHTTPPortInt32 is the default Jenkins HTTP port // DefaultHTTPPortInt32 is the default Jenkins HTTP port
DefaultHTTPPortInt32 = int32(8080) DefaultHTTPPortInt32 = int32(8080)
// DefaultSlavePortInt32 is the default Jenkins port for slaves // DefaultSlavePortInt32 is the default Jenkins port for slaves

2
pkg/groovy/groovy.go
View File

@ -77,7 +77,7 @@ func (g *Groovy) EnsureSingle(source, name, hash, groovyScript string) (requeue
g.jenkins.Status.AppliedGroovyScripts = appliedGroovyScripts g.jenkins.Status.AppliedGroovyScripts = appliedGroovyScripts
return true, g.k8sClient.Update(context.TODO(), g.jenkins) return true, g.k8sClient.Status().Update(context.TODO(), g.jenkins)
} }
// WaitForSecretSynchronization runs groovy script which waits to synchronize secrets in pod by k8s // WaitForSecretSynchronization runs groovy script which waits to synchronize secrets in pod by k8s

2
pkg/plugins/base_plugins.go
View File

@ -2,7 +2,7 @@ package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1850.va_a_8c31d3158b_" configurationAsCodePlugin = "configuration-as-code:1850.va_a_8c31d3158b_"
gitPlugin = "git:5.5.2" gitPlugin = "git:5.6.0"
jobDslPlugin = "job-dsl:1.89" jobDslPlugin = "job-dsl:1.89"
kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5"

4
test/bats/1-deploy.bats
View File

@ -33,7 +33,7 @@ diag() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.462.3-lts" \ --set jenkins.image="jenkins/jenkins:2.479.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -154,7 +154,7 @@ diag() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.462.3-lts" \ --set jenkins.image="jenkins/jenkins:2.479.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \

4
test/bats/2-deploy-with-more-options.bats
View File

@ -29,7 +29,7 @@ setup() {
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.nodeSelector.batstest=yep \ --set jenkins.nodeSelector.batstest=yep \
--set jenkins.image="jenkins/jenkins:2.462.3-lts" \ --set jenkins.image="jenkins/jenkins:2.479.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -103,7 +103,7 @@ setup() {
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.nodeSelector.batstest=yep \ --set jenkins.nodeSelector.batstest=yep \
--set jenkins.image="jenkins/jenkins:2.462.3-lts" \ --set jenkins.image="jenkins/jenkins:2.479.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \

4
test/bats/3-deploy-with-webhook.bats
View File

@ -29,7 +29,7 @@ setup() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.462.3-lts" \ --set jenkins.image="jenkins/jenkins:2.479.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=true \ --set jenkins.backup.makeBackupBeforePodDeletion=true \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
@ -90,7 +90,7 @@ setup() {
--set namespace=${DETIK_CLIENT_NAMESPACE} \ --set namespace=${DETIK_CLIENT_NAMESPACE} \
--set operator.image=${OPERATOR_IMAGE} \ --set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \ --set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.462.3-lts" \ --set jenkins.image="jenkins/jenkins:2.479.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=true \ --set jenkins.backup.makeBackupBeforePodDeletion=true \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \

2
test/e2e/configuration_test.go
View File

@ -25,7 +25,7 @@ const e2e = "e2e"
var expectedBasePluginsList = []plugins.Plugin{ var expectedBasePluginsList = []plugins.Plugin{
plugins.Must(plugins.New("configuration-as-code:1850.va_a_8c31d3158b_")), plugins.Must(plugins.New("configuration-as-code:1850.va_a_8c31d3158b_")),
plugins.Must(plugins.New("git:5.5.2")), plugins.Must(plugins.New("git:5.6.0")),
plugins.Must(plugins.New("kubernetes:4295.v7fa_01b_309c95")), plugins.Must(plugins.New("kubernetes:4295.v7fa_01b_309c95")),
plugins.Must(plugins.New("kubernetes-credentials-provider:1.262.v2670ef7ea_0c5")), plugins.Must(plugins.New("kubernetes-credentials-provider:1.262.v2670ef7ea_0c5")),
plugins.Must(plugins.New("job-dsl:1.89")), plugins.Must(plugins.New("job-dsl:1.89")),

2
test/e2e/test_utility.go
View File

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

2
test/helm/helm_test.go
View File

@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() {
cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug",
"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name), "--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name),
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.462.3-lts"), "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.479.2-lts"),
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--set-string", fmt.Sprintf("operator.image=%s", *imageName),
"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), "--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"),
"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install") "--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install")