Upgrade to v1.2.0 of gateway API (#680)

* Upgrade of go version, migration off v1beta1 and v1alpha2 for v1 gateway API objects, removed main 3rd party CRDs, working unit and integ tests

Author: erikfuller

.github/workflows/presubmit.yaml

@@ -19,14 +19,14 @@ jobs:
  - name: golangci-lint
  uses: golangci/golangci-lint-action@v3
  with:
- version: v1.54
+ version: v1.62.2
  args: --verbose --timeout 30m
 
  presubmit:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- k8sVersion: ["1.24.x"]
+ k8sVersion: ["1.31.1"]
  env:
  K8S_VERSION: ${{ matrix.k8sVersion }}
  steps:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.20.5 as builder
+FROM --platform=$BUILDPLATFORM golang:1.23.0 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -106,9 +106,9 @@ build-deploy: ## Create a deployment file that can be applied with `kubectl appl
 
 .PHONY: manifest
 manifest: ## Generate CRD manifest
-go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 object paths=./pkg/apis/...
-go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 crd paths=./pkg/apis/... output:crd:artifacts:config=config/crds/bases
-go run k8s.io/code-generator/cmd/register-gen@v0.28.0 --input-dirs ./pkg/apis/applicationnetworking/v1alpha1 --output-base ./ --go-header-file hack/boilerplate.go.txt
+go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5 object paths=./pkg/apis/...
+go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5 crd paths=./pkg/apis/... output:crd:artifacts:config=config/crds/bases
+go run k8s.io/code-generator/cmd/register-gen@v0.31.1 --logtostderr ./pkg/apis/applicationnetworking/v1alpha1 --go-header-file hack/boilerplate.go.txt
 cp config/crds/bases/application-networking.k8s.aws* helm/crds
 
 e2e-test-namespace := "e2e-test"

cmd/aws-application-networking-k8s/main.go

@@ -19,6 +19,7 @@ package main
 import (
 "flag"
 "os"
+gwv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 "strings"
 
 "github.com/aws/aws-application-networking-k8s/pkg/webhook"
@@ -39,14 +40,11 @@ import (
 ctrl "sigs.k8s.io/controller-runtime"
 "sigs.k8s.io/controller-runtime/pkg/healthz"
 
+"github.com/aws/aws-application-networking-k8s/pkg/controllers"
 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 "k8s.io/apimachinery/pkg/runtime/schema"
 "sigs.k8s.io/external-dns/endpoint"
-gwv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
-gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
-
-"github.com/aws/aws-application-networking-k8s/pkg/controllers"
-
+gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 //+kubebuilder:scaffold:imports
 anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
 "github.com/aws/aws-application-networking-k8s/pkg/config"
@@ -65,9 +63,9 @@ func init() {
 utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 //+kubebuilder:scaffold:scheme
-utilruntime.Must(gwv1alpha2.AddToScheme(scheme))
-utilruntime.Must(gwv1beta1.AddToScheme(scheme))
-utilruntime.Must(anv1alpha1.AddToScheme(scheme))
+utilruntime.Must(gwv1alpha2.Install(scheme))
+utilruntime.Must(gwv1.Install(scheme))
+utilruntime.Must(anv1alpha1.Install(scheme))
 utilruntime.Must(discoveryv1.AddToScheme(scheme))
 addOptionalCRDs(scheme)
 }

config/crds/bases/application-networking.k8s.aws_accesslogpolicies.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.13.0
+ controller-gen.kubebuilder.io/version: v0.16.5
  name: accesslogpolicies.application-networking.k8s.aws
 spec:
  group: application-networking.k8s.aws
@@ -27,32 +27,38 @@ spec:
  openAPIV3Schema:
  properties:
  apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ description: |-
+ APIVersion defines the versioned schema of this representation of an object.
+ Servers should convert recognized schemas to the latest internal value, and
+ may reject unrecognized values.
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
  type: string
  kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ description: |-
+ Kind is a string value representing the REST resource this object represents.
+ Servers may infer this from the endpoint the client submits requests to.
+ Cannot be updated.
+ In CamelCase.
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
  type: string
  metadata:
  type: object
  spec:
  description: AccessLogPolicySpec defines the desired state of AccessLogPolicy.
  properties:
  destinationArn:
- description: "The Amazon Resource Name (ARN) of the destination that
- will store access logs. Supported values are S3 Bucket, CloudWatch
- Log Group, and Firehose Delivery Stream ARNs. \n Changes to this
- value results in replacement of the VPC Lattice Access Log Subscription."
+ description: |-
+ The Amazon Resource Name (ARN) of the destination that will store access logs.
+ Supported values are S3 Bucket, CloudWatch Log Group, and Firehose Delivery Stream ARNs.
+
+ Changes to this value results in replacement of the VPC Lattice Access Log Subscription.
  pattern: ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9]+)*)?){2}:([^/].*)?
  type: string
  targetRef:
- description: "TargetRef points to the Kubernetes Gateway, HTTPRoute,
- or GRPCRoute resource that will have this policy attached. \n This
- field is following the guidelines of Kubernetes Gateway API policy
- attachment."
+ description: |-
+ TargetRef points to the Kubernetes Gateway, HTTPRoute, or GRPCRoute resource that will have this policy attached.
+
+ This field is following the guidelines of Kubernetes Gateway API policy attachment.
  properties:
  group:
  description: Group is the group of the target resource.
@@ -71,10 +77,11 @@ spec:
  minLength: 1
  type: string
  namespace:
- description: Namespace is the namespace of the referent. When
- unspecified, the local namespace is inferred. Even when policy
- targets a resource in a different namespace, it MUST only apply
- to traffic originating from the same namespace as the policy.
+ description: |-
+ Namespace is the namespace of the referent. When unspecified, the local
+ namespace is inferred. Even when policy targets a resource in a different
+ namespace, it MUST only apply to traffic originating from the same
+ namespace as the policy.
  maxLength: 63
  minLength: 1
  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
@@ -110,50 +117,48 @@ spec:
  reason: Pending
  status: Unknown
  type: Programmed
- description: "Conditions describe the current conditions of the AccessLogPolicy.
- \n Implementations should prefer to express Policy conditions using
- the `PolicyConditionType` and `PolicyConditionReason` constants
- so that operators and tools can converge on a common vocabulary
- to describe AccessLogPolicy state. \n Known condition types are:
- \n * \"Accepted\" * \"Ready\""
+ description: |-
+ Conditions describe the current conditions of the AccessLogPolicy.
+
+ Implementations should prefer to express Policy conditions
+ using the `PolicyConditionType` and `PolicyConditionReason`
+ constants so that operators and tools can converge on a common
+ vocabulary to describe AccessLogPolicy state.
+
+ Known condition types are:
+
+ * "Accepted"
+ * "Ready"
  items:
- description: "Condition contains details for one aspect of the current
- state of this API Resource. --- This struct is intended for direct
- use as an array at the field path .status.conditions. For example,
- \n type FooStatus struct{ // Represents the observations of a
- foo's current state. // Known .status.conditions.type are: \"Available\",
- \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
- // +listType=map // +listMapKey=type Conditions []metav1.Condition
- `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+ description: Condition contains details for one aspect of the current
+ state of this API Resource.
  properties:
  lastTransitionTime:
- description: lastTransitionTime is the last time the condition
- transitioned from one status to another. This should be when
- the underlying condition changed. If that is not known, then
- using the time when the API field changed is acceptable.
+ description: |-
+ lastTransitionTime is the last time the condition transitioned from one status to another.
+ This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
  format: date-time
  type: string
  message:
- description: message is a human readable message indicating
- details about the transition. This may be an empty string.
+ description: |-
+ message is a human readable message indicating details about the transition.
+ This may be an empty string.
  maxLength: 32768
  type: string
  observedGeneration:
- description: observedGeneration represents the .metadata.generation
- that the condition was set based upon. For instance, if .metadata.generation
- is currently 12, but the .status.conditions[x].observedGeneration
- is 9, the condition is out of date with respect to the current
- state of the instance.
+ description: |-
+ observedGeneration represents the .metadata.generation that the condition was set based upon.
+ For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+ with respect to the current state of the instance.
  format: int64
  minimum: 0
  type: integer
  reason:
- description: reason contains a programmatic identifier indicating
- the reason for the condition's last transition. Producers
- of specific condition types may define expected values and
- meanings for this field, and whether the values are considered
- a guaranteed API. The value should be a CamelCase string.
+ description: |-
+ reason contains a programmatic identifier indicating the reason for the condition's last transition.
+ Producers of specific condition types may define expected values and meanings for this field,
+ and whether the values are considered a guaranteed API.
+ The value should be a CamelCase string.
  This field may not be empty.
  maxLength: 1024
  minLength: 1
@@ -168,10 +173,6 @@ spec:
  type: string
  type:
  description: type of condition in CamelCase or in foo.example.com/CamelCase.
- --- Many .condition.type values are consistent across resources
- like Available, but because arbitrary conditions can be useful
- (see .node.status.conditions), the ability to deconflict is
- important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
  maxLength: 316
  pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
  type: string