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

bump controller-gen to v0.13.0 #2056

Merged
merged 1 commit into from
May 27, 2024
Merged

bump controller-gen to v0.13.0 #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -200,10 +200,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.7.0")
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.13.0")
else
rm -rf $(CONTROLLER_GEN)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0)
endif

.PHONY: kubectl
Expand Down
9 changes: 1 addition & 8 deletions 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,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: nodebuckets.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -69,9 +68,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
10 changes: 2 additions & 8 deletions 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,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: nodepools.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -91,6 +90,7 @@ spec:
description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
taints:
description: If specified, the Taints will be added to all nodes.
items:
Expand Down Expand Up @@ -244,9 +244,3 @@ spec:
namespace: kube-system
name: yurt-manager-webhook-service
path: /convert
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
11 changes: 3 additions & 8 deletions 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,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: yurtappdaemons.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -102,6 +101,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
revisionHistoryLimit:
description: Indicates the number of histories to be conserved. If
unspecified, defaults to 10.
Expand Down Expand Up @@ -152,6 +152,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
workloadTemplate:
description: WorkloadTemplate describes the pool that will be created.
properties:
Expand Down Expand Up @@ -267,9 +268,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions 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,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: yurtappoverriders.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -139,9 +138,3 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
13 changes: 5 additions & 8 deletions 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,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: yurtappsets.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -87,6 +86,7 @@ spec:
description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
topology:
description: Topology describes the pods distribution detail between each of pools.
properties:
Expand Down Expand Up @@ -144,6 +144,7 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
patch:
description: Indicates the patch for the templateSpec Now support strategic merge path :https://kubernetes.io/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch/#notes-on-the-strategic-merge-patch Patch takes precedence over Replicas fields If the Patch also modifies the Replicas, use the Replicas value in the Patch
type: object
Expand Down Expand Up @@ -357,6 +358,7 @@ spec:
description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
pools:
description: Pools is a list of selected nodepools specified with nodepool id in which workloads should be deployed in. It is primarily used for compatibility with v1alpha1 version and NodePoolSelector should be preferred to choose nodepools
items:
Expand Down Expand Up @@ -428,6 +430,7 @@ spec:
description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
pools:
description: Pools is a list of selected nodepools specified with nodepool id in which workloads should be adjusted. Pools is not recommended and NodePoolSelector should be preferred
items:
Expand Down Expand Up @@ -559,9 +562,3 @@ spec:
namespace: kube-system
name: yurt-manager-webhook-service
path: /convert
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions 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,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: yurtstaticsets.apps.openyurt.io
spec:
group: apps.openyurt.io
Expand Down Expand Up @@ -116,9 +115,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading
Loading