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

feat: update dependencies to 1.30 #2179

Merged
merged 9 commits into from
Nov 11, 2024
Merged

feat: update dependencies to 1.30 #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
978276c
feat: upgrade go version and k8s related pkg
vie-serendipity Oct 23, 2024
238b891
feat: modify node_life_cycle to adpat 1.30 because tain manager becom…
vie-serendipity Nov 7, 2024
8cae78a
chore: go mod tidy and resolve conflicts
vie-serendipity Nov 7, 2024
23099c3
chore: update go version of building files
vie-serendipity Nov 7, 2024
42bcf6a
chore: update dependencies
vie-serendipity Nov 7, 2024
c7d9f1e
fix: golang lint
vie-serendipity Nov 7, 2024
06b0a57
fix: csr test because type meta is emptytrivy-action
vie-serendipity Nov 7, 2024
3728a0d
test: fix platformadmin v1alpha2 unit test
vie-serendipity Nov 7, 2024
7ea7f5a
style: adjust package order
vie-serendipity Nov 7, 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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@ newcontroller:
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.14.0")
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.15.0")
else
rm -rf $(CONTROLLER_GEN)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0)
endif

.PHONY: kubectl
Expand Down
2 changes: 1 addition & 1 deletion charts/yurt-manager/crds/apps.openyurt.io_nodebuckets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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: nodebuckets.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down
4 changes: 3 additions & 1 deletion charts/yurt-manager/crds/apps.openyurt.io_nodepools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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: nodepools.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -100,11 +100,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
6 changes: 5 additions & 1 deletion charts/yurt-manager/crds/apps.openyurt.io_yurtappdaemons.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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: yurtappdaemons.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -92,11 +92,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -144,11 +146,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
2 changes: 1 addition & 1 deletion charts/yurt-manager/crds/apps.openyurt.io_yurtappoverriders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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: yurtappoverriders.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down
12 changes: 11 additions & 1 deletion charts/yurt-manager/crds/apps.openyurt.io_yurtappsets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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: yurtappsets.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -96,11 +96,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -159,11 +161,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchFields:
description: A list of node selector requirements by node's fields.
items:
Expand All @@ -189,11 +193,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
type: object
x-kubernetes-map-type: atomic
patch:
Expand Down Expand Up @@ -444,11 +450,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -533,11 +541,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
2 changes: 1 addition & 1 deletion charts/yurt-manager/crds/apps.openyurt.io_yurtstaticsets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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: yurtstaticsets.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down
Loading
Loading