Skip to content

Commit c0661ec

Browse files
chetan-rnschetan-rns
committed
chore: update controller-gen to v0.14.0
Signed-off-by: Chetan Banavikalmutt <[email protected]>
1 parent 9093ffb commit c0661ec

File tree

4 files changed

+36
-45
lines changed

4 files changed

+36
-45
lines changed

‎Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION)
4242

4343
# Image URL to use all building/pushing image targets
4444
IMG ?= $(IMAGE):$(VERSION)
45-
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
46-
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
4745

4846
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
4947
ifeq (,$(shell go env GOBIN))
@@ -79,7 +77,7 @@ help: ## Display this help.
7977
##@ Development
8078

8179
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
82-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
80+
$(CONTROLLER_GEN) rbac:roleName=manager-role webhook crd paths="./..." output:crd:artifacts:config=config/crd/bases
8381

8482
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
8583
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -172,7 +170,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
172170

173171
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
174172
controller-gen: ## Download controller-gen locally if necessary.
175-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
173+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
176174

177175
KUSTOMIZE = $(shell pwd)/bin/kustomize
178176
kustomize: ## Download kustomize locally if necessary.

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/pipelines.openshift.io_gitopsservices.yaml‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
97
name: gitopsservices.pipelines.openshift.io
108
spec:
119
group: pipelines.openshift.io
@@ -22,14 +20,19 @@ spec:
2220
description: GitopsService is the Schema for the gitopsservices API
2321
properties:
2422
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2828
type: string
2929
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3336
type: string
3437
metadata:
3538
type: object
@@ -50,40 +53,39 @@ spec:
5053
description: Tolerations allow the default workloads to schedule onto
5154
nodes with matching taints
5255
items:
53-
description: The pod this Toleration is attached to tolerates any
54-
taint that matches the triple <key,value,effect> using the matching
55-
operator <operator>.
56+
description: |-
57+
The pod this Toleration is attached to tolerates any taint that matches
58+
the triple <key,value,effect> using the matching operator <operator>.
5659
properties:
5760
effect:
58-
description: Effect indicates the taint effect to match. Empty
59-
means match all taint effects. When specified, allowed values
60-
are NoSchedule, PreferNoSchedule and NoExecute.
61+
description: |-
62+
Effect indicates the taint effect to match. Empty means match all taint effects.
63+
When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
6164
type: string
6265
key:
63-
description: Key is the taint key that the toleration applies
64-
to. Empty means match all taint keys. If the key is empty,
65-
operator must be Exists; this combination means to match all
66-
values and all keys.
66+
description: |-
67+
Key is the taint key that the toleration applies to. Empty means match all taint keys.
68+
If the key is empty, operator must be Exists; this combination means to match all values and all keys.
6769
type: string
6870
operator:
69-
description: Operator represents a key's relationship to the
70-
value. Valid operators are Exists and Equal. Defaults to Equal.
71-
Exists is equivalent to wildcard for value, so that a pod
72-
can tolerate all taints of a particular category.
71+
description: |-
72+
Operator represents a key's relationship to the value.
73+
Valid operators are Exists and Equal. Defaults to Equal.
74+
Exists is equivalent to wildcard for value, so that a pod can
75+
tolerate all taints of a particular category.
7376
type: string
7477
tolerationSeconds:
75-
description: TolerationSeconds represents the period of time
76-
the toleration (which must be of effect NoExecute, otherwise
77-
this field is ignored) tolerates the taint. By default, it
78-
is not set, which means tolerate the taint forever (do not
79-
evict). Zero and negative values will be treated as 0 (evict
80-
immediately) by the system.
78+
description: |-
79+
TolerationSeconds represents the period of time the toleration (which must be
80+
of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
81+
it is not set, which means tolerate the taint forever (do not evict). Zero and
82+
negative values will be treated as 0 (evict immediately) by the system.
8183
format: int64
8284
type: integer
8385
value:
84-
description: Value is the taint value the toleration matches
85-
to. If the operator is Exists, the value should be empty,
86-
otherwise just a regular string.
86+
description: |-
87+
Value is the taint value the toleration matches to.
88+
If the operator is Exists, the value should be empty, otherwise just a regular string.
8789
type: string
8890
type: object
8991
type: array
@@ -96,9 +98,3 @@ spec:
9698
storage: true
9799
subresources:
98100
status: {}
99-
status:
100-
acceptedNames:
101-
kind: ""
102-
plural: ""
103-
conditions: []
104-
storedVersions: []

‎config/rbac/role.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole
54
metadata:
6-
creationTimestamp: null
75
name: manager-role
86
rules:
97
- apiGroups:

0 commit comments

Comments
 (0)