Commit 214ff4c

committed

Merge branch 'master' into dependabot/go_modules/sigs.k8s.io/controller-runtime-0.17.1

2 parents 2dfd885 + d2104e6 commit 214ff4cCopy full SHA for 214ff4c

File tree

+477

-88

lines changed

+477

-88

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,6 @@ jobs:`
`64`	`64`
`65`	`65`	`- name: e2e test`
`66`	`66`	`run: \|`
`67`		`- # https://github.com/kubernetes-sigs/kustomize/issues/2867`
`68`		`- kustomize version`
`69`		`- sudo rm $(which kustomize)`
`70`		`-`
`71`	`67`	`kubectl get nodes -o wide`
`72`	`68`
`73`	`69`	`make load-kind-image install deploy`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Build the manager binary`
`2`		`-FROM golang:1.21 as builder`
	`2`	`+FROM golang:1.22 as builder`
`3`	`3`
`4`	`4`	`WORKDIR /workspace`
`5`	`5`	`# Copy the Go Modules manifests`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ all: manager`
`28`	`28`
`29`	`29`	`# Run tests`
`30`	`30`	`KUBEBUILDER_ASSETS=/tmp/envtest_assets.d`
`31`		`-K8S_VERSION=1.22.0`
	`31`	`+K8S_VERSION=1.29.1`
`32`	`32`	`GOOS=$(shell go env GOOS)`
`33`	`33`	`GOARCH=$(shell go env GOARCH)`
`34`	`34`	`test: generate fmt vet manifests`
`@@ -46,7 +46,7 @@ run: generate fmt vet manifests`
`46`	`46`
`47`	`47`	`# Install CRDs into a cluster`
`48`	`48`	`install: manifests kustomize`
`49`		`- $(KUSTOMIZE) build config/crd \| kubectl apply -f -`
	`49`	`+ $(KUSTOMIZE) build config/crd \| kubectl apply -f - --server-side`
`50`	`50`
`51`	`51`	`# Uninstall CRDs from a cluster`
`52`	`52`	`uninstall: manifests kustomize`
`@@ -55,7 +55,7 @@ uninstall: manifests kustomize`
`55`	`55`	`# Deploy controller in the configured Kubernetes cluster in ~/.kube/config`
`56`	`56`	`deploy: manifests kustomize`
`57`	`57`	`cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}`
`58`		`- $(KUSTOMIZE) build config/default \| kubectl apply -f -`
	`58`	`+ $(KUSTOMIZE) build config/default \| kubectl apply -f - --server-side`
`59`	`59`
`60`	`60`	`# Generate manifests e.g. CRD, RBAC etc.`
`61`	`61`	`manifests: controller-gen`

Comments

(0)