Merge branch 'main' into bump_strimzi_0.43.0_kafka_3.8

openshift-knative · Sep 30, 2024 · f2cbec5 · f2cbec5
2 parents 1809ef0 + 3d310c2
commit f2cbec5
Show file tree

Hide file tree

Showing 137 changed files with 1,791 additions and 1,021 deletions.
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -161,7 +161,7 @@ jobs:
       - name: Go Lint - knative-operator
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.55.2
+          version: v1.61.0
           args: --timeout=10m0s --verbose 
           working-directory: ./src/github.com/${{ github.repository }}
 

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -4,9 +4,6 @@ run:
   build-tags:
     - upgrade
 
-  skip-dirs:
-    - pkg/client
-
 linters:
   enable:
     - asciicheck
@@ -49,6 +46,9 @@ linters-settings:
         alias: $1$2
 
 issues:
+  exclude-dirs:
+    - pkg/client
+
   exclude-rules:
     - path: test # Excludes /test, *_test.go etc.
       linters:

diff --git a/Makefile b/Makefile
@@ -267,7 +267,7 @@ test-soak-testonly:
 
 test-soak:
 	UNINSTALL_STRIMZI="false" ./hack/strimzi.sh
-	SCALE_UP=5 INSTALL_KAFKA="true" ./hack/install.sh
+	SCALE_UP=6 INSTALL_KAFKA="true" ./hack/install.sh
 	./test/soak-tests.sh
 
 # Run all E2E tests.

diff --git a/docs/full-mesh.md b/docs/full-mesh.md
@@ -77,17 +77,19 @@ spec:
       enabled: true
   deployments:
   - name: activator
-    annotations:
+    labels:
       "sidecar.istio.io/inject": "true"
+    annotations:
       "sidecar.istio.io/rewriteAppHTTPProbers": "true"
   - name: autoscaler
-    annotations:
+    labels:
       "sidecar.istio.io/inject": "true"
+    annotations:
       "sidecar.istio.io/rewriteAppHTTPProbers": "true"
 EOF
 ```
 
-Then, create KnativeService with `sidecar.istio.io/inject: "true"`, `sidecar.istio.io/rewriteAppHTTPProbers: "true"` and `serving.knative.openshift.io/enablePassthrough: "true"` annotations in your namespace,
+Then, create KnativeService with the `sidecar.istio.io/inject: "true"` label and `sidecar.istio.io/rewriteAppHTTPProbers: "true"`, `serving.knative.openshift.io/enablePassthrough: "true"` annotations in your namespace,
 which is one of the namespaces in the `ServiceMeshMemberRoll`.
 
 ```sh
@@ -103,8 +105,9 @@ spec:
   template:
     metadata:
       name: hello-example-1
-      annotations:
+      labels:
         sidecar.istio.io/inject: "true"
+      annotations:
         sidecar.istio.io/rewriteAppHTTPProbers: "true"
     spec:
       containers:

diff --git a/docs/service-mesh/eventing/README.md b/docs/service-mesh/eventing/README.md
@@ -34,7 +34,7 @@ kubectl get all -n serverless-tests
 Run the custom source with Istio's proxy injected:
 
 ```shell
-kubectl -n serverless-tests run curl --annotations=sidecar.istio.io/inject=true --image=radial/busyboxplus:curl -i --tty --rm
+kubectl -n serverless-tests run curl --labels=sidecar.istio.io/inject=true --image=radial/busyboxplus:curl -i --tty --rm
 ```
 
 Send an event to a broker address:

diff --git a/docs/service-mesh/eventing/resources/kafka-broker-example.yaml b/docs/service-mesh/eventing/resources/kafka-broker-example.yaml
@@ -45,10 +45,9 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: event-display
-  annotations:
-    sidecar.istio.io/inject: 'true'
   labels:
     app: event-display
+    sidecar.istio.io/inject: 'true'
 spec:
   containers:
   - name: event-display

diff --git a/docs/service-mesh/eventing/resources/ping-source-kservice.yaml b/docs/service-mesh/eventing/resources/ping-source-kservice.yaml
@@ -7,8 +7,9 @@ metadata:
 spec:
   template:
     metadata:
-      annotations:
+      labels:
         sidecar.istio.io/inject: "true"
+      annotations:
         sidecar.istio.io/rewriteAppHTTPProbers: "true"
     spec:
       containers:

diff --git a/docs/service-mesh/eventing/resources/ping-source.yaml b/docs/service-mesh/eventing/resources/ping-source.yaml
@@ -67,10 +67,9 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: event-display
-  annotations:
-    sidecar.istio.io/inject: 'true'
   labels:
     app: event-display
+    sidecar.istio.io/inject: 'true'
 spec:
   containers:
     - name: event-display

diff --git a/docs/service-mesh/serving/mesh.md b/docs/service-mesh/serving/mesh.md
@@ -51,7 +51,7 @@ spec:
   - Ingress
 ```
 
-Then, create Knative Service with `sidecar.istio.io/inject: "true"` annotation in your namespace,
+Then, create Knative Service with `sidecar.istio.io/inject: "true"` label in your namespace,
 which is one of the namespaces in the `ServiceMeshMemberRoll`.
 
 ```sh
@@ -64,7 +64,7 @@ spec:
   template:
     metadata:
       name: hello-example-1
-      annotations:
+      labels:
         sidecar.istio.io/inject: "true"
     spec:
       containers:

diff --git a/go.mod b/go.mod
@@ -1,12 +1,14 @@
 module github.com/openshift-knative/serverless-operator
 
-go 1.22
+go 1.22.0
+
+toolchain go1.22.7
 
 require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/coreos/go-semver v0.3.1
 	github.com/google/go-cmp v0.6.0
-	github.com/jaegertracing/jaeger v1.60.0
+	github.com/jaegertracing/jaeger v1.61.0
 	github.com/manifestival/controller-runtime-client v0.4.0
 	github.com/manifestival/manifestival v0.7.2
 	github.com/openshift/api v3.9.0+incompatible
@@ -17,12 +19,12 @@ require (
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.73.2
 	github.com/prometheus/client_golang v1.20.3
-	github.com/prometheus/common v0.55.0
+	github.com/prometheus/common v0.59.1
 	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.8.0
-	google.golang.org/grpc v1.66.1
+	google.golang.org/grpc v1.67.0
 	k8s.io/api v0.29.3
 	k8s.io/apimachinery v0.29.3
 	k8s.io/client-go v0.29.3
@@ -38,24 +40,24 @@ require (
 )
 
 require (
-	github.com/IBM/sarama v1.43.2 // indirect
+	github.com/IBM/sarama v1.43.3 // indirect
 	github.com/cloudevents/conformance v0.2.0 // indirect
 	github.com/coreos/go-oidc/v3 v3.9.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.30.0 // indirect
+	go.opentelemetry.io/otel/trace v1.30.0 // indirect
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 )
 
 require (
@@ -70,7 +72,7 @@ require (
 	github.com/cloudevents/sdk-go/sql/v2 v2.15.2 // indirect
 	github.com/cloudevents/sdk-go/v2 v2.15.2
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/eapache/go-resiliency v1.6.0 // indirect
+	github.com/eapache/go-resiliency v1.7.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
@@ -136,13 +138,13 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sys v0.23.0 // indirect
-	golang.org/x/term v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.22.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.23.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect