Add support for Kubernetes 1.27 (jaegertracing#2235)

* Add support for Kubernetes 1.27 Signed-off-by: Israel Blancas <[email protected]> * Upgrade kind and update the CI Signed-off-by: Israel Blancas <[email protected]> * Fix format Signed-off-by: Israel Blancas <[email protected]> * Use newer base version for K8S since 1.19 and 1.20 are not supported since Kind 1.17 Signed-off-by: Israel Blancas <[email protected]> * Fix usage of deprecated methods Signed-off-by: Israel Blancas <[email protected]> * Fix K8s test environments Signed-off-by: Israel Blancas <[email protected]> * Add quotes to Go version Signed-off-by: Israel Blancas <[email protected]> --------- Signed-off-by: Israel Blancas <[email protected]>
iblancasa · Jul 4, 2023 · 8289578 · 8289578
1 parent 97c5a50
commit 8289578
Show file tree

Hide file tree

Showing 59 changed files with 741 additions and 747 deletions.
diff --git a/.github/workflows/e2e-elasticsearch.yaml b/.github/workflows/e2e-elasticsearch.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run Elasticsearch E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-examples.yaml b/.github/workflows/e2e-examples.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run examples E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-generate.yaml b/.github/workflows/e2e-generate.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run generate E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-miscellaneous.yaml b/.github/workflows/e2e-miscellaneous.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run miscellaneous E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-sidecar.yaml b/.github/workflows/e2e-sidecar.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run sidecar E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-streaming.yaml b/.github/workflows/e2e-streaming.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run streaming E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-ui.yaml b/.github/workflows/e2e-ui.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: UI E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
        kube-version:
        - "1.19"
-       - "1.25"
+       - "1.27"
     name: Run upgrade E2E tests
     steps:
       - name: "Check out code into the Go module directory"

diff --git a/Makefile b/Makefile
@@ -82,9 +82,9 @@ LD_FLAGS ?= "-X $(VERSION_PKG).version=$(VERSION) -X $(VERSION_PKG).buildDate=$(
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST ?= $(LOCALBIN)/setup-envtest
-ENVTEST_K8S_VERSION = 1.26
+ENVTEST_K8S_VERSION = 1.27
 # Options for KIND version to use
-export KUBE_VERSION ?= 1.26
+export KUBE_VERSION ?= 1.27
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 
 SCORECARD_TEST_IMG ?= quay.io/operator-framework/scorecard-test:v$(OPERATOR_SDK_VERSION)

diff --git a/apis/v1/jaeger_webhook.go b/apis/v1/jaeger_webhook.go
@@ -13,6 +13,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 const (
@@ -86,13 +87,13 @@ func (j *Jaeger) Default() {
 var _ webhook.Validator = &Jaeger{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (j *Jaeger) ValidateCreate() error {
+func (j *Jaeger) ValidateCreate() (admission.Warnings, error) {
 	jaegerlog.Info("validate create", "name", j.Name)
 	return j.ValidateUpdate(nil)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (j *Jaeger) ValidateUpdate(_ runtime.Object) error {
+func (j *Jaeger) ValidateUpdate(_ runtime.Object) (admission.Warnings, error) {
 	jaegerlog.Info("validate update", "name", j.Name)
 
 	if ShouldInjectOpenShiftElasticsearchConfiguration(j.Spec.Storage) && j.Spec.Storage.Elasticsearch.DoNotProvision {
@@ -103,24 +104,24 @@ func (j *Jaeger) ValidateUpdate(_ runtime.Object) error {
 			Name:      j.Spec.Storage.Elasticsearch.Name,
 		}, es)
 		if errors.IsNotFound(err) {
-			return fmt.Errorf("elasticsearch instance not found: %v", err)
+			return nil, fmt.Errorf("elasticsearch instance not found: %v", err)
 		}
 	}
 
 	for _, opt := range j.objsWithOptions() {
 		got := opt.DeepCopy().ToArgs()
 		if f := getAdditionalTLSFlags(got); f != nil {
-			return fmt.Errorf("tls flags incomplete, got: %v", got)
+			return nil, fmt.Errorf("tls flags incomplete, got: %v", got)
 		}
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (j *Jaeger) ValidateDelete() error {
+func (j *Jaeger) ValidateDelete() (admission.Warnings, error) {
 	jaegerlog.Info("validate delete", "name", j.Name)
-	return nil
+	return nil, nil
 }
 
 // OpenShiftElasticsearchNodeCount returns total node count of Elasticsearch nodes.

diff --git a/apis/v1/jaeger_webhook_test.go b/apis/v1/jaeger_webhook_test.go
@@ -177,7 +177,9 @@ func TestDefault(t *testing.T) {
 }
 
 func TestValidateDelete(t *testing.T) {
-	assert.Nil(t, new(Jaeger).ValidateDelete())
+	warnings, err := new(Jaeger).ValidateDelete()
+	assert.Nil(t, warnings)
+	assert.Nil(t, err)
 }
 
 func TestValidate(t *testing.T) {
@@ -275,13 +277,14 @@ func TestValidate(t *testing.T) {
 			fakeCl := fake.NewClientBuilder().WithRuntimeObjects(test.objsToCreate...).Build()
 			cl = fakeCl
 
-			err := test.current.ValidateCreate()
+			warnings, err := test.current.ValidateCreate()
 			if test.err != "" {
 				assert.NotNil(t, err)
 				assert.Equal(t, test.err, err.Error())
 			} else {
 				assert.Nil(t, err)
 			}
+			assert.Nil(t, warnings)
 		})
 	}
 }

diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -436,7 +436,7 @@ spec:
                 - --upstream=http://127.0.0.1:8383/
                 - --logtostderr=true
                 - --v=0
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
+                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
                 name: kube-rbac-proxy
                 ports:
                 - containerPort: 8443

diff --git a/bundle/manifests/jaegertracing.io_jaegers.yaml b/bundle/manifests/jaegertracing.io_jaegers.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: observability/jaeger-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     name: jaeger-operator

diff --git a/config/crd/bases/jaegertracing.io_jaegers.yaml b/config/crd/bases/jaegertracing.io_jaegers.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: jaegers.jaegertracing.io
 spec:
   group: jaegertracing.io

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8383/"

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

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
@@ -49,7 +48,6 @@ webhooks:
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:

diff --git a/controllers/appsv1/deployment_webhook.go b/controllers/appsv1/deployment_webhook.go
@@ -25,15 +25,13 @@ import (
 	"github.com/jaegertracing/jaeger-operator/pkg/tracing"
 )
 
-var (
-	_ admission.DecoderInjector = (*deploymentInterceptor)(nil)
-	_ webhook.AdmissionHandler  = (*deploymentInterceptor)(nil)
-)
+var _ webhook.AdmissionHandler = (*deploymentInterceptor)(nil)
 
 // NewDeploymentInterceptorWebhook creates a new deployment mutating webhook to be registered
-func NewDeploymentInterceptorWebhook(c client.Client) webhook.AdmissionHandler {
+func NewDeploymentInterceptorWebhook(c client.Client, decoder *admission.Decoder) webhook.AdmissionHandler {
 	return &deploymentInterceptor{
-		client: c,
+		client:  c,
+		decoder: decoder,
 	}
 }
 

diff --git a/controllers/appsv1/deployment_webhook_test.go b/controllers/appsv1/deployment_webhook_test.go
@@ -244,8 +244,8 @@ func TestReconcilieDeployment(t *testing.T) {
 				AdmissionResponse: admissionv1.AdmissionResponse{
 					Allowed: true,
 					Result: &metav1.Status{
-						Reason: "is jaeger deployment, we do not touch it",
-						Code:   200,
+						Message: "is jaeger deployment, we do not touch it",
+						Code:    200,
 					},
 				},
 			},
@@ -314,8 +314,8 @@ func TestReconcilieDeployment(t *testing.T) {
 				AdmissionResponse: admissionv1.AdmissionResponse{
 					Allowed: true,
 					Result: &metav1.Status{
-						Reason: "no suitable Jaeger instances found to inject a sidecar",
-						Code:   200,
+						Message: "no suitable Jaeger instances found to inject a sidecar",
+						Code:    200,
 					},
 				},
 			},
@@ -369,8 +369,8 @@ func TestReconcilieDeployment(t *testing.T) {
 				AdmissionResponse: admissionv1.AdmissionResponse{
 					Allowed: true,
 					Result: &metav1.Status{
-						Reason: "not watching in namespace, we do not touch the deployment",
-						Code:   200,
+						Message: "not watching in namespace, we do not touch the deployment",
+						Code:    200,
 					},
 				},
 			},
@@ -398,7 +398,8 @@ func TestReconcilieDeployment(t *testing.T) {
 				errors:    tc.errors,
 			}
 
-			r := NewDeploymentInterceptorWebhook(cl)
+			decoder := admission.NewDecoder(scheme.Scheme)
+			r := NewDeploymentInterceptorWebhook(cl, decoder)
 
 			req := admission.Request{}
 			if !tc.emptyRequest {
@@ -419,9 +420,6 @@ func TestReconcilieDeployment(t *testing.T) {
 				}
 			}
 
-			decoder, err := admission.NewDecoder(s)
-			require.NoError(t, err)
-			admission.InjectDecoderInto(decoder, r)
 			resp := r.Handle(context.Background(), req)
 
 			assert.Len(t, resp.Patches, len(tc.resp.Patches))
@@ -433,8 +431,6 @@ func TestReconcilieDeployment(t *testing.T) {
 			})
 
 			assert.Equal(t, tc.resp, resp)
-
-			require.NoError(t, err)
 		})
 	}
 }
diff --git a/controllers/jaegertracing/jaeger_controller.go b/controllers/jaegertracing/jaeger_controller.go
@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/operator-framework/operator-lib/handler"
 
@@ -69,7 +68,10 @@ func (r *JaegerReconciler) Reconcile(ctx context.Context, request ctrl.Request)
 func (r *JaegerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	err := ctrl.NewControllerManagedBy(mgr).
 		For(&v1.Jaeger{}).
-		Watches(&source.Kind{Type: &v1.Jaeger{}}, &handler.InstrumentedEnqueueRequestForObject{}).
+		Watches(
+			&v1.Jaeger{},
+			&handler.InstrumentedEnqueueRequestForObject{},
+		).
 		Complete(r)
 	return err
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ jobs: @@
           matrix:
            kube-version:
            - "1.19"
-           - "1.25"
+           - "1.27"
         name: Run Elasticsearch E2E tests
         steps:
           - name: "Check out code into the Go module directory"
@@ Expand Down @@