upgrade: gateway-api along with controller-runtime

.github/workflows/e2e-custom.yaml

@@ -10,8 +10,9 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  KIND_IMAGE: 'kindest/node:v1.23.3'
+  GO_VERSION: '1.19'
+  KIND_VERSION: 'v0.18.0'
+  KIND_IMAGE: 'kindest/node:v1.26.3'
   KIND_CLUSTER_NAME: 'ci-testing'
 
 jobs:
@@ -29,6 +30,7 @@ jobs:
       - name: Setup Kind Cluster
         uses: helm/[email protected]
         with:
+          version: ${{ env.KIND_VERSION }}
           node_image: ${{ env.KIND_IMAGE }}
           cluster_name: ${{ env.KIND_CLUSTER_NAME }}
           config: ./test/kind-conf.yaml

.github/workflows/e2e-multi-network-provider.yaml

@@ -10,8 +10,9 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  KIND_IMAGE: 'kindest/node:v1.23.3'
+  GO_VERSION: '1.19'
+  KIND_VERSION: 'v0.18.0'
+  KIND_IMAGE: 'kindest/node:v1.26.3'
   KIND_CLUSTER_NAME: 'ci-testing'
 
 jobs:
@@ -29,6 +30,7 @@ jobs:
       - name: Setup Kind Cluster
         uses: helm/[email protected]
         with:
+          version: ${{ env.KIND_VERSION }}
           node_image: ${{ env.KIND_IMAGE }}
           cluster_name: ${{ env.KIND_CLUSTER_NAME }}
           config: ./test/kind-conf.yaml

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.18 as builder
+FROM golang:1.19-alpine3.17 AS builder
 
 WORKDIR /workspace
 

Makefile

@@ -91,11 +91,12 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
+CONTROLLER_GEN_VERSION = v0.11.0
 controller-gen: ## Download controller-gen locally if necessary.
-ifeq ("$(shell $(CONTROLLER_GEN) --version)", "Version: v0.7.0")
+ifeq ("$(shell $(CONTROLLER_GEN) --version)", "Version: ${CONTROLLER_GEN_VERSION}")
 else
 	rm -rf $(CONTROLLER_GEN)
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION})
 endif
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize

api/v1alpha1/trafficrouting_types.go

@@ -90,7 +90,7 @@ type TrafficRoutingStrategy struct {
 	//   my-header: bar
 	//
 	// +optional
-	RequestHeaderModifier *gatewayv1beta1.HTTPRequestHeaderFilter `json:"requestHeaderModifier,omitempty"`
+	RequestHeaderModifier *gatewayv1beta1.HTTPHeaderFilter `json:"requestHeaderModifier,omitempty"`
 	// Matches define conditions used for matching the incoming HTTP requests to canary service.
 	// Each match is independent, i.e. this rule will be matched if **any** one of the matches is satisfied.
 	// If Gateway API, current only support one match.

api/v1beta1/rollout_types.go

@@ -257,7 +257,7 @@ type TrafficRoutingStrategy struct {
 	//   my-header: bar
 	//
 	// +optional
-	RequestHeaderModifier *gatewayv1beta1.HTTPRequestHeaderFilter `json:"requestHeaderModifier,omitempty"`
+	RequestHeaderModifier *gatewayv1beta1.HTTPHeaderFilter `json:"requestHeaderModifier,omitempty"`
 	// Matches define conditions used for matching incoming HTTP requests to the canary service.
 	// Each match is independent, i.e. this rule will be matched as long as **any** one of the matches is satisfied.
 	//
@@ -356,6 +356,8 @@ type RolloutCondition struct {
 type RolloutConditionType string
 
 // These are valid conditions of a rollout.
+//
+//goland:noinspection GoUnusedConst
 const (
 	// RolloutConditionProgressing means the rollout is progressing. Progress for a rollout is
 	// considered when a new replica set is created or adopted, when pods scale
@@ -557,6 +559,7 @@ const (
 
 type FinalisingStepType string
 
+//goland:noinspection GoUnusedConst
 const (
 	// Route all traffic to stable or new version based on FinaliseReason (for bluegreen)
 	FinalisingStepTypeRouteAllTraffic FinalisingStepType = "RouteAllTraffic"

config/crd/bases/rollouts.kruise.io_batchreleases.yaml

@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: batchreleases.rollouts.kruise.io
 spec:
@@ -550,9 +549,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/crd/bases/rollouts.kruise.io_rollouthistories.yaml

@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.11.0
   creationTimestamp: null
   name: rollouthistories.rollouts.kruise.io
 spec:
@@ -168,9 +167,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []