Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump sigs.k8s.io/gateway-api from 1.0.0 to 1.1.0 and other related deps #263

Merged
merged 2 commits into from
May 16, 2024
Merged

chore(deps): bump sigs.k8s.io/gateway-api from 1.0.0 to 1.1.0 and other related deps #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2282589
chore(deps): bump sigs.k8s.io/gateway-api from 1.0.0 to 1.1.0 and oth…
dependabot[bot] May 15, 2024
6214055
Wait for CRDs
programmer04 May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .tools_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# renovate: datasource=github-releases depName=kubernetes/code-generator
code-generator: "0.29.1"
code-generator: "0.30.1"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
controller-tools: "0.14.0"
controller-tools: "0.15.0"
# renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
kustomize: "5.3.0"
kustomize: "5.4.1"
# renovate: datasource=github-releases depName=golangci/golangci-lint
golangci-lint: "1.57.2"
# renovate: datasource=github-releases depName=GoogleContainerTools/skaffold
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,8 @@ generate.clientsets: client-gen
--input-base '' \
--input $(REPO)/apis/v1alpha1 \
--input $(REPO)/apis/v1beta1 \
--output-base pkg/ \
--output-package $(REPO)/pkg/ \
--trim-path-prefix pkg/$(REPO)/
--output-dir pkg/ \
--output-pkg $(REPO)/pkg/
rm apis
find ./pkg/clientset/ -type f -name '*.go' -exec sed -i '' -e 's/github.com\/kong\/gateway-operator\/apis/github.com\/kong\/gateway-operator\/api/gI' {} \; &> /dev/null
.PHONY: generate.rbacs
Expand Down Expand Up @@ -374,7 +373,7 @@ test.conformance:

.PHONY: test.samples
test.samples: kustomize
find ./config/samples -not -name "kustomization.*" -type f | xargs -I{} bash -c "kubectl apply -f {}; kubectl delete -f {}"
find ./config/samples -not -name "kustomization.*" -type f | sort | xargs -I{} bash -c "kubectl apply -f {}; kubectl delete -f {}"

# ------------------------------------------------------------------------------
# Gateway API
Expand Down Expand Up @@ -500,6 +499,7 @@ install: manifests kustomize install-gateway-api-crds
.PHONY: install.all
install.all: manifests kustomize install-gateway-api-crds
kubectl apply --server-side -f $(PROJECT_DIR)/config/crd/bases/
kubectl get crd -ojsonpath='{.items[*].metadata.name}' | xargs -n1 kubectl wait --for condition=established crd

# Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
# Call with ignore-not-found=true to ignore resource not found errors during deletion.
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/gateway-operator.konghq.com_aigateways.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: aigateways.gateway-operator.konghq.com
spec:
group: gateway-operator.konghq.com
Expand Down
561 changes: 500 additions & 61 deletions config/crd/bases/gateway-operator.konghq.com_controlplanes.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/crd/bases/gateway-operator.konghq.com_dataplanemetricsextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: dataplanemetricsextensions.gateway-operator.konghq.com
spec:
group: gateway-operator.konghq.com
Expand Down
567 changes: 506 additions & 61 deletions config/crd/bases/gateway-operator.konghq.com_dataplanes.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,128 changes: 1,007 additions & 121 deletions config/crd/bases/gateway-operator.konghq.com_gatewayconfigurations.yaml
View file
Open in desktop

Large diffs are not rendered by default.

567 changes: 506 additions & 61 deletions config/crd/dataplane/gateway-operator.konghq.com_dataplanes.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/samples/aigateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# on behalf of the AIGateway to determine the address by which the Kong
# Gateway can be reached. In later iterations we'll have endpoints provided via
# the AIGateway resource status.
# See: https://github.com/Kong/gateway-operator/issues/1368
# See: https://github.com/Kong/gateway-operator/issues/137
#
# Once you have the endpoint, the path to your backends are based on the
# identifiers provided in the AIGateway below, and then you should be able to
Expand Down
2 changes: 1 addition & 1 deletion controller/controlplane/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

func init() {
if err := gatewayv1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
Expand Down
2 changes: 1 addition & 1 deletion controller/dataplane/controller_reconciler_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func init() {
if err := gatewayv1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
Expand Down
2 changes: 1 addition & 1 deletion controller/dataplane/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
)

func init() {
if err := gatewayv1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
Expand Down
2 changes: 1 addition & 1 deletion controller/dataplane/controller_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func TestEnsureDataPlaneReadyStatus(t *testing.T) {
require.NoError(t, corev1.AddToScheme(scheme))
require.NoError(t, appsv1.AddToScheme(scheme))
require.NoError(t, operatorv1beta1.AddToScheme(scheme))
require.NoError(t, gatewayv1.AddToScheme(scheme))
require.NoError(t, gatewayv1.Install(scheme))

fakeClient := fakectrlruntimeclient.
NewClientBuilder().
Expand Down
4 changes: 2 additions & 2 deletions controller/gateway/controller_reconciler_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
)

func init() {
if err := gatewayv1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
if err := gatewayv1beta1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1beta1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
Expand Down
2 changes: 1 addition & 1 deletion controller/gateway/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
)

func init() {
if err := gatewayv1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
Expand Down
2 changes: 1 addition & 1 deletion controller/gatewayclass/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func init() {
if err := gatewayv1.AddToScheme(scheme.Scheme); err != nil {
if err := gatewayv1.Install(scheme.Scheme); err != nil {
fmt.Println("error while adding gatewayv1 scheme")
os.Exit(1)
}
Expand Down
105 changes: 53 additions & 52 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/kong/gateway-operator

go 1.22
go 1.22.0

toolchain go1.22.0
toolchain go1.22.3

// 1.2.2 was released on main branch with a breaking change that was not
// intended to be released in 1.2.x:
Expand All @@ -23,11 +23,11 @@ require (
github.com/kr/pretty v0.3.1
github.com/samber/lo v1.39.0
github.com/stretchr/testify v1.9.0
k8s.io/api v0.29.4
k8s.io/apimachinery v0.29.4
k8s.io/client-go v0.29.4
sigs.k8s.io/controller-runtime v0.17.3
sigs.k8s.io/gateway-api v1.0.0
k8s.io/api v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.1
sigs.k8s.io/controller-runtime v0.18.2
sigs.k8s.io/gateway-api v1.1.0
)

require (
Expand All @@ -52,7 +52,7 @@ require (
github.com/google/go-github/v48 v48.2.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gruntwork-io/go-commons v0.8.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand All @@ -64,6 +64,7 @@ require (
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
Expand All @@ -87,14 +88,14 @@ require (
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28 // indirect
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/tools v0.17.0 // indirect
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/tools v0.20.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
k8s.io/apiserver v0.29.4 // indirect
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
k8s.io/apiserver v0.30.1 // indirect
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
)

require (
Expand Down Expand Up @@ -136,13 +137,13 @@ require (
github.com/docker/docker v26.0.2+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.7 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/goccy/go-json v0.10.2
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down Expand Up @@ -181,11 +182,11 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.29.3
k8s.io/component-base v0.29.4 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
k8s.io/kubernetes v1.29.4
k8s.io/apiextensions-apiserver v0.30.0
k8s.io/component-base v0.30.1 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
k8s.io/kubernetes v1.30.1
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
Expand All @@ -196,34 +197,34 @@ require (
// They can be updated with `./hack/update-k8sio-gomod-replace.sh` script.
// This is a workaround for https://github.com/Kong/gateway-operator/issues/1384.
replace (
k8s.io/api => k8s.io/api v0.29.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
k8s.io/apiserver => k8s.io/apiserver v0.29.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
k8s.io/client-go => k8s.io/client-go v0.29.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
k8s.io/code-generator => k8s.io/code-generator v0.29.4
k8s.io/component-base => k8s.io/component-base v0.29.4
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
k8s.io/cri-api => k8s.io/cri-api v0.29.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.4
k8s.io/endpointslice => k8s.io/endpointslice v0.29.4
k8s.io/kms => k8s.io/kms v0.29.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.4
k8s.io/kubectl => k8s.io/kubectl v0.29.4
k8s.io/kubelet => k8s.io/kubelet v0.29.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.4
k8s.io/metrics => k8s.io/metrics v0.29.4
k8s.io/mount-utils => k8s.io/mount-utils v0.29.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.4
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.4
k8s.io/sample-controller => k8s.io/sample-controller v0.29.4
k8s.io/api => k8s.io/api v0.30.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery => k8s.io/apimachinery v0.30.1
k8s.io/apiserver => k8s.io/apiserver v0.30.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.1
k8s.io/client-go => k8s.io/client-go v0.30.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.1
k8s.io/code-generator => k8s.io/code-generator v0.30.1
k8s.io/component-base => k8s.io/component-base v0.30.1
k8s.io/component-helpers => k8s.io/component-helpers v0.30.1
k8s.io/controller-manager => k8s.io/controller-manager v0.30.1
k8s.io/cri-api => k8s.io/cri-api v0.30.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.1
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.1
k8s.io/endpointslice => k8s.io/endpointslice v0.30.1
k8s.io/kms => k8s.io/kms v0.30.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.1
k8s.io/kubectl => k8s.io/kubectl v0.30.1
k8s.io/kubelet => k8s.io/kubelet v0.30.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.1
k8s.io/metrics => k8s.io/metrics v0.30.1
k8s.io/mount-utils => k8s.io/mount-utils v0.30.1
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.1
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.1
k8s.io/sample-controller => k8s.io/sample-controller v0.30.1
)
Loading
Loading