Merge pull request #1671 from SaschaSchwarze0/sascha-bump-tekton

Bump Tekton
shipwright-io · Oct 2, 2024 · cf21062 · cf21062
2 parents 0fb343c + 73a8da7
commit cf21062
Show file tree

Hide file tree

Showing 1,134 changed files with 135,757 additions and 53,982 deletions.
diff --git a/.github/bump-tekton-lts.sh b/.github/bump-tekton-lts.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Copyright The Shipwright Contributors
+#
+# SPDX-License-Identifier: Apache-2.0
 
 set -euo pipefail
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache: true
           check-latest: true
       - name: Install Trivy
@@ -63,13 +63,13 @@ jobs:
       fail-fast: false
       matrix:
         kubernetes:
-          - v1.27.11
-          - v1.29.2
+          - v1.28.13
+          - v1.31.0
         tekton:
           # oldest LTS that exists at the time of our planned next release
           - v0.53.5
           # newest LTS that exists at the time of our planned next release
-          - v0.59.2 # RETAIN-COMMENT: TEKTON_NEWEST_LTS
+          - v0.62.3 # RETAIN-COMMENT: TEKTON_NEWEST_LTS
       max-parallel: 4
     runs-on: ubuntu-latest
     steps:
@@ -78,7 +78,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache: true
           check-latest: true
       - name: Install Ko
@@ -120,8 +120,12 @@ jobs:
           TEKTON_VERSION: ${{ matrix.tekton }}
         run: |
           make kind-tekton
-          kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-controller --timeout=1m
-          kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-webhook --timeout=1m
+          if ! kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-controller --timeout=3m; then
+            echo "[ERROR] Tekton installation did not complete. Debug info:"
+            kubectl -n tekton-pipelines get pod -o wide
+            exit 1
+          fi
+          kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-webhook --timeout=3m
       - name: Test
         run: |
           # host.docker.internal does not work in a GitHub action
@@ -139,13 +143,13 @@ jobs:
       fail-fast: false
       matrix:
         kubernetes:
-          - v1.27.11
-          - v1.29.2
+          - v1.28.13
+          - v1.31.0
         tekton:
           # oldest LTS that exists at the time of our planned next release
           - v0.53.5
           # newest LTS that exists at the time of our planned next release
-          - v0.59.2 # RETAIN-COMMENT: TEKTON_NEWEST_LTS
+          - v0.62.3 # RETAIN-COMMENT: TEKTON_NEWEST_LTS
       max-parallel: 4
     runs-on: ubuntu-latest
     steps:
@@ -164,7 +168,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache: true
           check-latest: true
       - name: Install kubectl
@@ -203,8 +207,12 @@ jobs:
           TEKTON_VERSION: ${{ matrix.tekton }}
         run: |
           make kind-tekton
-          kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-controller --timeout=1m
-          kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-webhook --timeout=1m
+          if ! kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-controller --timeout=3m; then
+            echo "[ERROR] Tekton installation did not complete. Debug info:"
+            kubectl -n tekton-pipelines get pod -o wide
+            exit 1
+          fi
+          kubectl -n tekton-pipelines rollout status deployment tekton-pipelines-webhook --timeout=3m
       - name: Install Registry
         run: |
           kubectl apply -f test/data/registry.yaml

diff --git a/.github/workflows/mirror-images.yaml b/.github/workflows/mirror-images.yaml
@@ -24,6 +24,7 @@ jobs:
             library/golang:1.19 \
             library/golang:1.20 \
             library/golang:1.21 \
+            library/golang:1.22 \
             library/maven:3-jdk-8-openj9 \
             library/node:12 \
             library/node:14 \

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -22,7 +22,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.x'
+        go-version: '1.22.x'
         cache: true
         check-latest: true
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -37,7 +37,7 @@ jobs:
         fetch-depth: 0  # Fetch all history, needed for release note generation.
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.x'
+        go-version: '1.22.x'
         cache: true
         check-latest: true
 

diff --git a/.github/workflows/update-tekton-version.yaml b/.github/workflows/update-tekton-version.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache: true
           check-latest: true
 

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -27,7 +27,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.21.x'
+        go-version: '1.22.x'
         cache: true
         check-latest: true
         cache-dependency-path: go/src/github.com/shipwright-io/build

diff --git a/HACK.md b/HACK.md
@@ -41,7 +41,7 @@ In the near future, the above would be setup by the controller.
 make clean && make build
 ```
 
-* This project uses Golang 1.21 and controller-gen v0.12.1.
+* This project uses Golang 1.22 and controller-gen v0.14.0.
 * The controllers create/watch Tekton objects.
 
 # Testing

diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ ZAP_FLAGS ?= --zap-log-level=debug --zap-encoder=console
 TEST_NAMESPACE ?= default
 
 # CI: tekton pipelines controller version
-TEKTON_VERSION ?= v0.50.5
+TEKTON_VERSION ?= v0.62.3
 
 # E2E test flags
 TEST_E2E_FLAGS ?= -r -p --randomize-all -timeout=1h -trace -v

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Shipwright supports any tool that can build container images in Kubernetes clust
 - We also require a Tekton installation (v0.50.+). To install the latest LTS release, run:
 
   ```bash
-  kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.50.5/release.yaml
+  kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.62.3/release.yaml
   ```
 
   If you are using OpenShift cluster refer [Running on OpenShift](#running-on-openshift) for some more configurations.

diff --git a/cmd/shipwright-build-controller/main.go b/cmd/shipwright-build-controller/main.go
@@ -22,6 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	buildconfig "github.com/shipwright-io/build/pkg/config"
 	"github.com/shipwright-io/build/pkg/controller"
@@ -90,8 +91,9 @@ func main() {
 		LeaseDuration:           buildCfg.ManagerOptions.LeaseDuration,
 		RenewDeadline:           buildCfg.ManagerOptions.RenewDeadline,
 		RetryPeriod:             buildCfg.ManagerOptions.RetryPeriod,
-		Namespace:               "",
-		MetricsBindAddress:      fmt.Sprintf("%s:%d", metricsHost, metricsPort),
+		Metrics: server.Options{
+			BindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
+		},
 	})
 	if err != nil {
 		ctxlog.Error(ctx, err, "")
@@ -122,7 +124,7 @@ func main() {
 	// Add optionally configured extra handlers to metrics endpoint
 	for path, handler := range buildMetrics.ExtraHandlers() {
 		ctxlog.Info(ctx, "Adding metrics extra handler path", "path", path)
-		if err := mgr.AddMetricsExtraHandler(path, handler); err != nil {
+		if err := mgr.AddMetricsServerExtraHandler(path, handler); err != nil {
 			ctxlog.Error(ctx, err, "")
 			os.Exit(2)
 		}