Skip to content

Commit 0c3bd39

Browse files
coderangercoderanger
committed
🎨 More upgrade stuff.
Tests pass locally.
1 parent e3b2d64 commit 0c3bd39

File tree

8 files changed

+75
-96
lines changed

8 files changed

+75
-96
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
5-
CRD_OPTIONS ?= "crd:trivialVersions=true"
5+
CRD_OPTIONS ?= "crd"
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -69,7 +69,7 @@ controller-gen:
6969
ifeq (, $(shell which controller-gen))
7070
@{ \
7171
set -e ;\
72-
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\
72+
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2 ;\
7373
}
7474
CONTROLLER_GEN=$(GOBIN)/controller-gen
7575
else

‎api/v1beta1/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/migrations.coderanger.net_migrators.yaml

Lines changed: 70 additions & 85 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.17.2
97
name: migrators.migrations.coderanger.net
108
spec:
119
group: migrations.coderanger.net
@@ -22,14 +20,19 @@ spec:
2220
description: Migrator is the Schema for the migrators 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
@@ -57,33 +60,33 @@ spec:
5760
type: string
5861
type: object
5962
selector:
60-
description: A label selector is a label query over a set of resources.
61-
The result of matchLabels and matchExpressions are ANDed. An empty
62-
label selector matches all objects. A null label selector matches
63-
no objects.
63+
description: |-
64+
A label selector is a label query over a set of resources. The result of matchLabels and
65+
matchExpressions are ANDed. An empty label selector matches all objects. A null
66+
label selector matches no objects.
6467
properties:
6568
matchExpressions:
6669
description: matchExpressions is a list of label selector requirements.
6770
The requirements are ANDed.
6871
items:
69-
description: A label selector requirement is a selector that
70-
contains values, a key, and an operator that relates the key
71-
and values.
72+
description: |-
73+
A label selector requirement is a selector that contains values, a key, and an operator that
74+
relates the key and values.
7275
properties:
7376
key:
7477
description: key is the label key that the selector applies
7578
to.
7679
type: string
7780
operator:
78-
description: operator represents a key's relationship to
79-
a set of values. Valid operators are In, NotIn, Exists
80-
and DoesNotExist.
81+
description: |-
82+
operator represents a key's relationship to a set of values.
83+
Valid operators are In, NotIn, Exists and DoesNotExist.
8184
type: string
8285
values:
83-
description: values is an array of string values. If the
84-
operator is In or NotIn, the values array must be non-empty.
85-
If the operator is Exists or DoesNotExist, the values
86-
array must be empty. This array is replaced during a strategic
86+
description: |-
87+
values is an array of string values. If the operator is In or NotIn,
88+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
89+
the values array must be empty. This array is replaced during a strategic
8790
merge patch.
8891
items:
8992
type: string
@@ -96,41 +99,41 @@ spec:
9699
matchLabels:
97100
additionalProperties:
98101
type: string
99-
description: matchLabels is a map of {key,value} pairs. A single
100-
{key,value} in the matchLabels map is equivalent to an element
101-
of matchExpressions, whose key field is "key", the operator
102-
is "In", and the values array contains only "value". The requirements
103-
are ANDed.
102+
description: |-
103+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
104+
map is equivalent to an element of matchExpressions, whose key field is "key", the
105+
operator is "In", and the values array contains only "value". The requirements are ANDed.
104106
type: object
105107
type: object
108+
x-kubernetes-map-type: atomic
106109
templateSelector:
107-
description: A label selector is a label query over a set of resources.
108-
The result of matchLabels and matchExpressions are ANDed. An empty
109-
label selector matches all objects. A null label selector matches
110-
no objects.
110+
description: |-
111+
A label selector is a label query over a set of resources. The result of matchLabels and
112+
matchExpressions are ANDed. An empty label selector matches all objects. A null
113+
label selector matches no objects.
111114
properties:
112115
matchExpressions:
113116
description: matchExpressions is a list of label selector requirements.
114117
The requirements are ANDed.
115118
items:
116-
description: A label selector requirement is a selector that
117-
contains values, a key, and an operator that relates the key
118-
and values.
119+
description: |-
120+
A label selector requirement is a selector that contains values, a key, and an operator that
121+
relates the key and values.
119122
properties:
120123
key:
121124
description: key is the label key that the selector applies
122125
to.
123126
type: string
124127
operator:
125-
description: operator represents a key's relationship to
126-
a set of values. Valid operators are In, NotIn, Exists
127-
and DoesNotExist.
128+
description: |-
129+
operator represents a key's relationship to a set of values.
130+
Valid operators are In, NotIn, Exists and DoesNotExist.
128131
type: string
129132
values:
130-
description: values is an array of string values. If the
131-
operator is In or NotIn, the values array must be non-empty.
132-
If the operator is Exists or DoesNotExist, the values
133-
array must be empty. This array is replaced during a strategic
133+
description: |-
134+
values is an array of string values. If the operator is In or NotIn,
135+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
136+
the values array must be empty. This array is replaced during a strategic
134137
merge patch.
135138
items:
136139
type: string
@@ -143,61 +146,53 @@ spec:
143146
matchLabels:
144147
additionalProperties:
145148
type: string
146-
description: matchLabels is a map of {key,value} pairs. A single
147-
{key,value} in the matchLabels map is equivalent to an element
148-
of matchExpressions, whose key field is "key", the operator
149-
is "In", and the values array contains only "value". The requirements
150-
are ANDed.
149+
description: |-
150+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
151+
map is equivalent to an element of matchExpressions, whose key field is "key", the
152+
operator is "In", and the values array contains only "value". The requirements are ANDed.
151153
type: object
152154
type: object
155+
x-kubernetes-map-type: atomic
153156
required:
154157
- selector
155158
type: object
156159
status:
157160
description: MigratorStatus defines the observed state of Migrator
158161
properties:
159162
conditions:
160-
description: 'Represents the observations of a RabbitUsers''s current
161-
state. Known .status.conditions.type are: Ready, UserReady, PermissionsReady'
163+
description: |-
164+
Represents the observations of a RabbitUsers's current state.
165+
Known .status.conditions.type are: Ready, UserReady, PermissionsReady
162166
items:
163-
description: "Condition contains details for one aspect of the current
164-
state of this API Resource. --- This struct is intended for direct
165-
use as an array at the field path .status.conditions. For example,
166-
type FooStatus struct{ // Represents the observations of a
167-
foo's current state. // Known .status.conditions.type are:
168-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
169-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
170-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
171-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
172-
\n // other fields }"
167+
description: Condition contains details for one aspect of the current
168+
state of this API Resource.
173169
properties:
174170
lastTransitionTime:
175-
description: lastTransitionTime is the last time the condition
176-
transitioned from one status to another. This should be when
177-
the underlying condition changed. If that is not known, then
178-
using the time when the API field changed is acceptable.
171+
description: |-
172+
lastTransitionTime is the last time the condition transitioned from one status to another.
173+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
179174
format: date-time
180175
type: string
181176
message:
182-
description: message is a human readable message indicating
183-
details about the transition. This may be an empty string.
177+
description: |-
178+
message is a human readable message indicating details about the transition.
179+
This may be an empty string.
184180
maxLength: 32768
185181
type: string
186182
observedGeneration:
187-
description: observedGeneration represents the .metadata.generation
188-
that the condition was set based upon. For instance, if .metadata.generation
189-
is currently 12, but the .status.conditions[x].observedGeneration
190-
is 9, the condition is out of date with respect to the current
191-
state of the instance.
183+
description: |-
184+
observedGeneration represents the .metadata.generation that the condition was set based upon.
185+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
186+
with respect to the current state of the instance.
192187
format: int64
193188
minimum: 0
194189
type: integer
195190
reason:
196-
description: reason contains a programmatic identifier indicating
197-
the reason for the condition's last transition. Producers
198-
of specific condition types may define expected values and
199-
meanings for this field, and whether the values are considered
200-
a guaranteed API. The value should be a CamelCase string.
191+
description: |-
192+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
193+
Producers of specific condition types may define expected values and meanings for this field,
194+
and whether the values are considered a guaranteed API.
195+
The value should be a CamelCase string.
201196
This field may not be empty.
202197
maxLength: 1024
203198
minLength: 1
@@ -212,10 +207,6 @@ spec:
212207
type: string
213208
type:
214209
description: type of condition in CamelCase or in foo.example.com/CamelCase.
215-
--- Many .condition.type values are consistent across resources
216-
like Available, but because arbitrary conditions can be useful
217-
(see .node.status.conditions), the ability to deconflict is
218-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
219210
maxLength: 316
220211
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
221212
type: string
@@ -238,9 +229,3 @@ spec:
238229
storage: true
239230
subresources:
240231
status: {}
241-
status:
242-
acceptedNames:
243-
kind: ""
244-
plural: ""
245-
conditions: []
246-
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:

‎config/webhook/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
54
metadata:
6-
creationTimestamp: null
75
name: mutating-webhook-configuration
86
webhooks:
97
- admissionReviewVersions:

‎integration/integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var _ = Describe("Integration", func() {
148148
},
149149
},
150150
ReadinessProbe: &corev1.Probe{
151-
Handler: corev1.Handler{
151+
ProbeHandler: corev1.ProbeHandler{
152152
HTTPGet: &corev1.HTTPGetAction{
153153
Path: "/",
154154
Port: intstr.FromInt(8000),

‎stubs/argoproj/v1alpha1/groupversion_info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ See the License for the specific language governing permissions and
1212
limitations under the License.
1313
*/
1414

15-
//+kubebuilder:object:generate=true
16-
//+groupName=argoproj.io
15+
// +kubebuilder:object:generate=true
16+
// +groupName=argoproj.io
1717
package v1alpha1
1818

1919
import (

‎stubs/argoproj/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.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy