Skip to content

Commit cb9e0e2

Browse files
kimwnasptdkimwnasptd
committed
fix: update envtest for gsc pull errors in unit tests
Signed-off-by: Kimonas Sotirchos <kimwnasptd@gmail.com>
1 parent f6d6d67 commit cb9e0e2

File tree

9 files changed

+66
-38
lines changed

9 files changed

+66
-38
lines changed

‎components/notebook-controller/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ test: manifests generate fmt vet envtest ## Run tests.
6969
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -v ./... -coverprofile cover.out
7070
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -v ./controllers/... -coverprofile cover.out
7171

72+
7273
.PHONY: manager
7374
manager: generate fmt vet ## Build manager binary.
7475
go build -o bin/manager main.go
@@ -102,7 +103,7 @@ docker-build-multi-arch: ## Build multi-arch docker images with docker buildx
102103

103104

104105
.PHONY: docker-build-push-multi-arch
105-
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
106+
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
106107
cd .. && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} --push -f ./notebook-controller/Dockerfile .
107108

108109

@@ -136,15 +137,15 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
136137
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
137138
.PHONY: controller-gen
138139
controller-gen: ## Download controller-gen locally if necessary.
139-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
140+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.0)
140141

141142
KUSTOMIZE = $(shell pwd)/bin/kustomize
142143
.PHONY: kustomize
143144
kustomize: ## Download kustomize locally if necessary.
144145
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v3.2.0)
145146

146147
ENVTEST = $(shell pwd)/bin/setup-envtest
147-
ENVTEST_VERSION?=release-0.14
148+
ENVTEST_VERSION?=latest
148149

149150
.PHONY: envtest
150151
envtest: ## Download envtest-setup locally if necessary.

‎components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: notebooks.kubeflow.org
88
spec:
99
group: kubeflow.org
@@ -623,6 +623,7 @@ spec:
623623
format: int32
624624
type: integer
625625
service:
626+
default: ""
626627
type: string
627628
required:
628629
- port
@@ -727,6 +728,7 @@ spec:
727728
format: int32
728729
type: integer
729730
service:
731+
default: ""
730732
type: string
731733
required:
732734
- port
@@ -885,6 +887,7 @@ spec:
885887
format: int32
886888
type: integer
887889
service:
890+
default: ""
888891
type: string
889892
required:
890893
- port
@@ -1240,6 +1243,7 @@ spec:
12401243
format: int32
12411244
type: integer
12421245
service:
1246+
default: ""
12431247
type: string
12441248
required:
12451249
- port
@@ -1344,6 +1348,7 @@ spec:
13441348
format: int32
13451349
type: integer
13461350
service:
1351+
default: ""
13471352
type: string
13481353
required:
13491354
- port
@@ -1502,6 +1507,7 @@ spec:
15021507
format: int32
15031508
type: integer
15041509
service:
1510+
default: ""
15051511
type: string
15061512
required:
15071513
- port
@@ -1862,6 +1868,7 @@ spec:
18621868
format: int32
18631869
type: integer
18641870
service:
1871+
default: ""
18651872
type: string
18661873
required:
18671874
- port
@@ -1966,6 +1973,7 @@ spec:
19661973
format: int32
19671974
type: integer
19681975
service:
1976+
default: ""
19691977
type: string
19701978
required:
19711979
- port
@@ -2124,6 +2132,7 @@ spec:
21242132
format: int32
21252133
type: integer
21262134
service:
2135+
default: ""
21272136
type: string
21282137
required:
21292138
- port
@@ -2399,6 +2408,9 @@ spec:
23992408
maxSkew:
24002409
format: int32
24012410
type: integer
2411+
minDomains:
2412+
format: int32
2413+
type: integer
24022414
topologyKey:
24032415
type: string
24042416
whenUnsatisfiable:
@@ -3801,6 +3813,7 @@ spec:
38013813
format: int32
38023814
type: integer
38033815
service:
3816+
default: ""
38043817
type: string
38053818
required:
38063819
- port
@@ -3905,6 +3918,7 @@ spec:
39053918
format: int32
39063919
type: integer
39073920
service:
3921+
default: ""
39083922
type: string
39093923
required:
39103924
- port
@@ -4063,6 +4077,7 @@ spec:
40634077
format: int32
40644078
type: integer
40654079
service:
4080+
default: ""
40664081
type: string
40674082
required:
40684083
- port
@@ -4418,6 +4433,7 @@ spec:
44184433
format: int32
44194434
type: integer
44204435
service:
4436+
default: ""
44214437
type: string
44224438
required:
44234439
- port
@@ -4522,6 +4538,7 @@ spec:
45224538
format: int32
45234539
type: integer
45244540
service:
4541+
default: ""
45254542
type: string
45264543
required:
45274544
- port
@@ -4680,6 +4697,7 @@ spec:
46804697
format: int32
46814698
type: integer
46824699
service:
4700+
default: ""
46834701
type: string
46844702
required:
46854703
- port
@@ -5040,6 +5058,7 @@ spec:
50405058
format: int32
50415059
type: integer
50425060
service:
5061+
default: ""
50435062
type: string
50445063
required:
50455064
- port
@@ -5144,6 +5163,7 @@ spec:
51445163
format: int32
51455164
type: integer
51465165
service:
5166+
default: ""
51475167
type: string
51485168
required:
51495169
- port
@@ -5302,6 +5322,7 @@ spec:
53025322
format: int32
53035323
type: integer
53045324
service:
5325+
default: ""
53055326
type: string
53065327
required:
53075328
- port
@@ -5577,6 +5598,9 @@ spec:
55775598
maxSkew:
55785599
format: int32
55795600
type: integer
5601+
minDomains:
5602+
format: int32
5603+
type: integer
55805604
topologyKey:
55815605
type: string
55825606
whenUnsatisfiable:
@@ -6979,6 +7003,7 @@ spec:
69797003
format: int32
69807004
type: integer
69817005
service:
7006+
default: ""
69827007
type: string
69837008
required:
69847009
- port
@@ -7083,6 +7108,7 @@ spec:
70837108
format: int32
70847109
type: integer
70857110
service:
7111+
default: ""
70867112
type: string
70877113
required:
70887114
- port
@@ -7241,6 +7267,7 @@ spec:
72417267
format: int32
72427268
type: integer
72437269
service:
7270+
default: ""
72447271
type: string
72457272
required:
72467273
- port
@@ -7596,6 +7623,7 @@ spec:
75967623
format: int32
75977624
type: integer
75987625
service:
7626+
default: ""
75997627
type: string
76007628
required:
76017629
- port
@@ -7700,6 +7728,7 @@ spec:
77007728
format: int32
77017729
type: integer
77027730
service:
7731+
default: ""
77037732
type: string
77047733
required:
77057734
- port
@@ -7858,6 +7887,7 @@ spec:
78587887
format: int32
78597888
type: integer
78607889
service:
7890+
default: ""
78617891
type: string
78627892
required:
78637893
- port
@@ -8218,6 +8248,7 @@ spec:
82188248
format: int32
82198249
type: integer
82208250
service:
8251+
default: ""
82218252
type: string
82228253
required:
82238254
- port
@@ -8322,6 +8353,7 @@ spec:
83228353
format: int32
83238354
type: integer
83248355
service:
8356+
default: ""
83258357
type: string
83268358
required:
83278359
- port
@@ -8480,6 +8512,7 @@ spec:
84808512
format: int32
84818513
type: integer
84828514
service:
8515+
default: ""
84838516
type: string
84848517
required:
84858518
- port
@@ -8755,6 +8788,9 @@ spec:
87558788
maxSkew:
87568789
format: int32
87578790
type: integer
8791+
minDomains:
8792+
format: int32
8793+
type: integer
87588794
topologyKey:
87598795
type: string
87608796
whenUnsatisfiable:

‎components/notebook-controller/config/rbac/role.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ kind: ClusterRole
44
metadata:
55
name: role
66
rules:
7-
- apiGroups:
8-
- apps
9-
resources:
10-
- statefulsets
11-
verbs:
12-
- '*'
137
- apiGroups:
148
- ""
159
resources:
@@ -34,6 +28,12 @@ rules:
3428
- services
3529
verbs:
3630
- '*'
31+
- apiGroups:
32+
- apps
33+
resources:
34+
- statefulsets
35+
verbs:
36+
- '*'
3737
- apiGroups:
3838
- gateway.networking.k8s.io
3939
resources:

‎components/notebook-controller/controllers/suite_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
ctrl "sigs.k8s.io/controller-runtime"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
"sigs.k8s.io/controller-runtime/pkg/envtest"
32-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3332
logf "sigs.k8s.io/controller-runtime/pkg/log"
3433
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3534

@@ -94,7 +93,6 @@ var _ = BeforeSuite(func() {
9493

9594
k8sClient = k8sManager.GetClient()
9695
Expect(k8sClient).ToNot(BeNil())
97-
9896
}, 60)
9997

10098
var _ = AfterSuite(func() {
@@ -107,7 +105,5 @@ var _ = AfterSuite(func() {
107105
func TestAPIs(t *testing.T) {
108106
RegisterFailHandler(Fail)
109107

110-
RunSpecsWithDefaultAndCustomReporters(t,
111-
"Controller Suite",
112-
[]Reporter{printer.NewlineReporter{}})
108+
RunSpecs(t, "Controller Suite")
113109
}

‎components/notebook-controller/reconcilehelper/util.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,3 @@ func CopyVirtualService(from, to *unstructured.Unstructured) bool {
217217
}
218218
return requiresUpdate
219219
}
220-

‎components/tensorboard-controller/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
7777
# Build the docker image
7878
.PHONY: docker-build
7979
docker-build:
80-
cd ../ && docker build -t ${IMG}:${TAG} -f tensorboard-controller/Dockerfile .
80+
cd ../ && docker build -t ${IMG}:${TAG} -f tensorboard-controller/Dockerfile .
8181

8282
# Push the docker image
8383
.PHONY: docker-push
@@ -90,7 +90,7 @@ docker-build-multi-arch: ## Build multi-arch docker images with docker buildx
9090

9191

9292
.PHONY: docker-build-push-multi-arch
93-
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
93+
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
9494
cd ../ && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} --push -f tensorboard-controller/Dockerfile .
9595

9696
##@ Deployment
@@ -119,15 +119,15 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
119119
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
120120
.PHONY: controller-gen
121121
controller-gen: ## Download controller-gen locally if necessary.
122-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
122+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.0)
123123

124124
KUSTOMIZE = $(shell pwd)/bin/kustomize
125125
.PHONY: kustomize
126126
kustomize: ## Download kustomize locally if necessary.
127127
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v3.2.0)
128128

129129
ENVTEST = $(shell pwd)/bin/setup-envtest
130-
ENVTEST_VERSION?=release-0.14
130+
ENVTEST_VERSION?=latest
131131

132132
.PHONY: envtest
133133
envtest: ## Download envtest-setup locally if necessary.
@@ -141,4 +141,4 @@ set -e ;\
141141
echo "Downloading $(2)" ;\
142142
GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
143143
}
144-
endef
144+
endef

‎components/tensorboard-controller/config/crd/bases/tensorboard.kubeflow.org_tensorboards.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: tensorboards.tensorboard.kubeflow.org
88
spec:
99
group: tensorboard.kubeflow.org

0 commit comments

Comments
 (0)