chore: bump go and deps (#991)

* chore: bump go and deps Signed-off-by: Jorge Turrado <[email protected]> * bump linter Signed-off-by: Jorge Turrado <[email protected]> * bumps deps Signed-off-by: Jorge Turrado <[email protected]> * bumps deps Signed-off-by: Jorge Turrado <[email protected]> * bump deps Signed-off-by: Jorge Turrado <[email protected]> * update CIs Signed-off-by: Jorge Turrado <[email protected]> * update manifests Signed-off-by: Jorge Turrado <[email protected]> * . Signed-off-by: Jorge Turrado <[email protected]> * fix kustomize Signed-off-by: Jorge Turrado <[email protected]> * some updates Signed-off-by: Jorge Turrado <[email protected]> * pin deps Signed-off-by: Jorge Turrado <[email protected]> * bump deps Signed-off-by: Jorge Turrado <[email protected]> * bump deps Signed-off-by: Jorge Turrado <[email protected]> --------- Signed-off-by: Jorge Turrado <[email protected]> Signed-off-by: Jorge Turrado <[email protected]>
kedacore · Apr 30, 2024 · 7feda00 · 7feda00
1 parent c5de19c
commit 7feda00
Show file tree

Hide file tree

Showing 49 changed files with 426 additions and 305 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM golang:1.21.6
+FROM golang:1.22.2
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -55,7 +55,7 @@ RUN apt-get update \
     && go install honnef.co/go/tools/cmd/staticcheck@latest \
     && go install golang.org/x/tools/gopls@latest \
     # Install golangci-lint
-    && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 \
+    && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2 \
     #
     # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
     && groupadd --gid $USER_GID $USERNAME \

diff --git a/.github/workflows/build_canary.yml b/.github/workflows/build_canary.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: ghcr.io/kedacore/keda-tools:1.21.6
+    container: ghcr.io/kedacore/keda-tools:1.22.2
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
 

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: ghcr.io/kedacore/keda-tools:1.21.6
+    container: ghcr.io/kedacore/keda-tools:1.22.2
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
 

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -19,11 +19,11 @@ jobs:
         kubernetesVersion: [v1.29, v1.28, v1.27]
         include:
         - kubernetesVersion: v1.29
-          kindImage: kindest/node:v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570
+          kindImage: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245
         - kubernetesVersion: v1.28
-          kindImage: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
+          kindImage: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58
         - kubernetesVersion: v1.27
-          kindImage: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+          kindImage: kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843
     steps:
       - name: Install prerequisites
         run: |
@@ -34,6 +34,10 @@ jobs:
 
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
 
+      - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v4.1
+        with:
+          go-version: "1.22"
+
       - name: Helm install
         uses: Azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
 
@@ -103,7 +107,7 @@ jobs:
 
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v4.1
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
       - name: Helm install
         uses: Azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0

diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -10,7 +10,7 @@ concurrency:
 jobs:
   build_scaler:
     runs-on: ubuntu-latest
-    container: ghcr.io/kedacore/keda-tools:1.21.6
+    container: ghcr.io/kedacore/keda-tools:1.22.2
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       - name: Register workspace path
@@ -22,7 +22,7 @@ jobs:
 
   build_operator:
     runs-on: ubuntu-latest
-    container: ghcr.io/kedacore/keda-tools:1.21.6
+    container: ghcr.io/kedacore/keda-tools:1.22.2
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       - name: Register workspace path
@@ -34,7 +34,7 @@ jobs:
 
   build_interceptor:
     runs-on: ubuntu-latest
-    container: ghcr.io/kedacore/keda-tools:1.21.6
+    container: ghcr.io/kedacore/keda-tools:1.22.2
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       - name: Register workspace path

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -13,7 +13,7 @@ jobs:
   validate:
     name: validate - ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
-    container: ghcr.io/kedacore/keda-tools:1.21.6
+    container: ghcr.io/kedacore/keda-tools:1.22.2
     strategy:
       matrix:
         include:
@@ -76,7 +76,7 @@ jobs:
           python-version: 3.x
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v4.1
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Get golangci
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
+        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
diff --git a/Makefile b/Makefile
@@ -52,6 +52,9 @@ test: fmt vet
 e2e-test:
 	go run -tags e2e ./tests/run-all.go
 
+e2e-test-local:
+	SKIP_SETUP=true go run -tags e2e ./tests/run-all.go
+
 # Docker targets
 docker-build-operator:
 	DOCKER_BUILDKIT=1 docker build . -t ${IMAGE_OPERATOR_VERSIONED_TAG} -t ${IMAGE_OPERATOR_SHA_TAG} -f operator/Dockerfile --build-arg VERSION=${VERSION} --build-arg GIT_COMMIT=${GIT_COMMIT}
@@ -134,7 +137,7 @@ pre-commit: ## Run static-checks.
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	GOBIN=$(shell pwd)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
+	GOBIN=$(shell pwd)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
@@ -148,14 +151,17 @@ deploy: manifests kustomize ## Deploy to the K8s cluster specified in ~/.kube/co
 	$(KUSTOMIZE) edit set image ghcr.io/kedacore/http-add-on-interceptor=${IMAGE_INTERCEPTOR_VERSIONED_TAG}
 
 	cd config/interceptor && \
-	$(KUSTOMIZE) edit add patch --path otel/deployment.yaml --group apps --kind Deployment --name interceptor --version v1
+	$(KUSTOMIZE) edit add patch --path e2e-test/deployment.yaml --group apps --kind Deployment --name interceptor --version v1
 
 	cd config/interceptor && \
-	$(KUSTOMIZE) edit add patch --path otel/scaledobject.yaml --group keda.sh --kind ScaledObject --name interceptor --version v1alpha1
+	$(KUSTOMIZE) edit add patch --path e2e-test/scaledobject.yaml --group keda.sh --kind ScaledObject --name interceptor --version v1alpha1
 
 	cd config/scaler && \
 	$(KUSTOMIZE) edit set image ghcr.io/kedacore/http-add-on-scaler=${IMAGE_SCALER_VERSIONED_TAG}
 
+	cd config/scaler && \
+	$(KUSTOMIZE) edit add patch --path e2e-test/deployment.yaml --group apps --kind Deployment --name scaler --version v1
+
 	cd config/operator && \
 	$(KUSTOMIZE) edit set image ghcr.io/kedacore/http-add-on-operator=${IMAGE_OPERATOR_VERSIONED_TAG}
 

diff --git a/config/crd/bases/http.keda.sh_httpscaledobjects.yaml b/config/crd/bases/http.keda.sh_httpscaledobjects.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: httpscaledobjects.http.keda.sh
 spec:
   group: http.keda.sh

diff --git a/config/interceptor/deployment.yaml b/config/interceptor/deployment.yaml
@@ -23,6 +23,10 @@ spec:
       containers:
       - name: interceptor
         image: ghcr.io/kedacore/http-add-on-interceptor
+        args:
+        - --zap-log-level=info
+        - --zap-encoder=console
+        - --zap-time-encoding=rfc3339
         env:
         - name: KEDA_HTTP_CURRENT_NAMESPACE
           value: "keda"

diff --git a/config/interceptor/e2e-test/deployment.yaml b/config/interceptor/e2e-test/deployment.yaml
@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: interceptor
+spec:
+  replicas: 1
+  template:
+    spec:
+      containers:
+      - name: interceptor
+        env:
+        - name: KEDA_HTTP_OTEL_PROM_EXPORTER_ENABLED
+          value: "true"
+        - name: KEDA_HTTP_OTEL_PROM_EXPORTER_PORT
+          value: "2223"
+        - name: KEDA_HTTP_OTEL_HTTP_EXPORTER_ENABLED
+          value: "true"
+        - name: KEDA_HTTP_OTEL_HTTP_COLLECTOR_ENDPOINT
+          value: "opentelemetry-collector.open-telemetry-system:4318"
+        - name: KEDA_HTTP_OTEL_HTTP_COLLECTOR_INSECURE
+          value: "true"
+        - name: KEDA_HTTP_OTEL_METRIC_EXPORT_INTERVAL
+          value: "1"
diff --git a/config/interceptor/e2e-test/kustomization.yaml b/config/interceptor/e2e-test/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- deployment.yaml
+- scaledobject.yaml
diff --git a/config/interceptor/e2e-test/scaledobject.yaml b/config/interceptor/e2e-test/scaledobject.yaml
@@ -0,0 +1,6 @@
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: interceptor
+spec:
+  minReplicaCount: 1
diff --git a/config/interceptor/transformerconfig.yaml b/config/interceptor/transformerconfig.yaml
@@ -1,9 +1,5 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: TransformerConfig
 namePrefix:
-  - apiVersion: keda.sh/v1alpha1
-    kind: ScaledObject
+  - kind: ScaledObject
     path: spec/scaleTargetRef/name
-  - apiVersion: keda.sh/v1alpha1
-    kind: ScaledObject
+  - kind: ScaledObject
     path: spec/triggers/metadata/scalerAddress
diff --git a/config/operator/deployment.yaml b/config/operator/deployment.yaml
@@ -24,6 +24,9 @@ spec:
         image: ghcr.io/kedacore/http-add-on-operator
         args:
         - --leader-elect
+        - --zap-log-level=info
+        - --zap-encoder=console
+        - --zap-time-encoding=rfc3339
         env:
         - name: KEDAHTTP_OPERATOR_EXTERNAL_SCALER_SERVICE
           value: "keda-http-add-on-external-scaler"

diff --git a/config/scaler/deployment.yaml b/config/scaler/deployment.yaml
@@ -23,6 +23,10 @@ spec:
       containers:
       - name: scaler
         image: ghcr.io/kedacore/http-add-on-scaler
+        args:
+        - --zap-log-level=info
+        - --zap-encoder=console
+        - --zap-time-encoding=rfc3339
         env:
         - name: KEDA_HTTP_SCALER_TARGET_ADMIN_DEPLOYMENT
           value: "keda-http-add-on-interceptor"

diff --git a/config/scaler/e2e-test/deployment.yaml b/config/scaler/e2e-test/deployment.yaml
@@ -0,0 +1,6 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: scaler
+spec:
+  replicas: 1
diff --git a/config/scaler/e2e-test/kustomization.yaml b/config/scaler/e2e-test/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- deployment.yaml