Skip to content

Upgrade k8s componets to 1.30 #45

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

Merged
merged 8 commits into from
Jun 17, 2025
Merged

Upgrade k8s componets to 1.30 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2415ddc
Upgrade k8s componets to 1.30
sachinkumarsingh092 Jun 12, 2025
859f0a0
Remove netbox.digitalocean.com from schema
sachinkumarsingh092 Jun 12, 2025
05bdbfb
1.22.0 -> 1.22 w/o go mod tidy
sachinkumarsingh092 Jun 12, 2025
c144a41
Change SHA for envtest imamges
sachinkumarsingh092 Jun 16, 2025
724b894
make target to build and change in integation test flow
sachinkumarsingh092 Jun 16, 2025
ae46905
Add netbox type
sachinkumarsingh092 Jun 16, 2025
d034eed
Fix unit tests: ignore APIversion type
sachinkumarsingh092 Jun 16, 2025
764b5fa
Remove ENVTEST_DIGEST from makefile
sachinkumarsingh092 Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
password: ${{ secrets.DOCKER_HUB_TOKEN }}

# Build a new testenv image to use if and only if the Dockerfile or Makefile is changed in this PR
- name: Build image
run : ./scripts/build-image-conditionally.sh
- name: Build image and push to Docker Hub
run : make envtest-image && make envtest-image-push

- name: Run integration tests
run : ./scripts/integration-test.sh
19 changes: 11 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ NAME := netbox-ip-controller
IMAGE ?= "${NAME}:$(GITCOMMIT)"
# Path to k8s-env-test image on Docker Hub
ENVTEST := digitalocean/k8s-env-test
# Digest of the currently used envtest image
ENVTEST_DIGEST := sha256:f2d8c1e431bf079f48854e2910da8e66cb5b829380a8052f5d7ecaf49a341896

K8S_VERSION := 1.29.11
K8S_VERSION := 1.30.11
ETCD_VERSION := 3.5.0
GO_VERSION := 1.21
GO_VERSION := 1.22.0

ifeq ($(strip $(shell git status --porcelain 2>/dev/null)),)
GIT_TREE_STATE=clean
Expand Down Expand Up @@ -66,7 +64,8 @@ crd:
go mod download && \
go mod vendor && \
popd && \
vendor/k8s.io/code-generator/generate-groups.sh all github.com/digitalocean/netbox-ip-controller/client github.com/digitalocean/netbox-ip-controller/api 'netbox:v1beta1'" && \
source vendor/k8s.io/code-generator/kube_codegen.sh && \
kube::codegen::gen_client --output-dir client --output-pkg github.com/digitalocean/netbox-ip-controller/client --boilerplate vendor/k8s.io/code-generator/examples/hack/boilerplate.go.txt api" && \
go mod tidy && \
go mod vendor

Expand All @@ -76,19 +75,23 @@ envtest-image:

.PHONY: get-envtest-image-tag
get-envtest-image-tag:
echo ${ENVTEST}@${ENVTEST_DIGEST}
echo $(ENVTEST):$(GITCOMMIT)

.PHONY:
envtest-image-push:
docker push digitalocean/k8s-env-test:$(GITCOMMIT)

.PHONY:
integration-test:
TEST_IMAGE=${ENVTEST}@${ENVTEST_DIGEST} ./local/local-integration-test.sh all
TEST_IMAGE=$(ENVTEST):$(GITCOMMIT) ./local/local-integration-test.sh all

.PHONY:
setup:
./local/local-integration-test.sh setup

.PHONY:
execute:
TEST_IMAGE=${ENVTEST}@${ENVTEST_DIGEST} ./local/local-integration-test.sh execute
TEST_IMAGE=$(ENVTEST):$(GITCOMMIT) ./local/local-integration-test.sh execute

.PHONY:
cleanup:
Expand Down
3 changes: 1 addition & 2 deletions client/clientset/versioned/clientset.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions client/clientset/versioned/typed/netbox/v1beta1/fake/fake_netboxip.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ module github.com/digitalocean/netbox-ip-controller
go 1.22

require (
github.com/go-logr/zapr v1.2.4
github.com/go-logr/zapr v1.3.0
github.com/google/go-cmp v0.6.0
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-multierror v1.0.0
github.com/hashicorp/go-retryablehttp v0.7.1
github.com/prometheus/client_golang v1.16.0
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.11.0
go.uber.org/zap v1.25.0
go.uber.org/zap v1.26.0
golang.org/x/time v0.3.0
k8s.io/api v0.29.11
k8s.io/apiextensions-apiserver v0.28.7
k8s.io/apimachinery v0.29.11
k8s.io/client-go v0.29.11
k8s.io/api v0.30.11
k8s.io/apiextensions-apiserver v0.30.11
k8s.io/apimachinery v0.30.11
k8s.io/client-go v0.30.11
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.16.1
sigs.k8s.io/controller-runtime v0.18.7
)

require (
Expand All @@ -30,16 +30,16 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -61,7 +61,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -71,23 +71,23 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.28.7 // indirect
k8s.io/component-base v0.28.7 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/apiserver v0.30.11 // indirect
k8s.io/component-base v0.30.11 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
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.3.0 // indirect
Expand Down
Loading