Skip to content

Commit bb26dc7

Browse files
committed
fix: update controller-tools to prevent invalid array in golang.org/x/tools/internal/tokeninternal
Signed-off-by: Denis GERMAIN <[email protected]>
1 parent d56a9c3 commit bb26dc7

File tree

3 files changed

+52
-19
lines changed

3 files changed

+52
-19
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
197197

198198
## Tool Versions
199199
KUSTOMIZE_VERSION ?= v5.4.3
200-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
200+
CONTROLLER_TOOLS_VERSION ?= v0.17.0
201201

202202
.PHONY: kustomize
203203
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.

config/crd/bases/criu.org_checkpointrestoreoperators.yaml

Lines changed: 51 additions & 11 deletions
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.15.0
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: checkpointrestoreoperators.criu.org
88
spec:
99
group: criu.org
@@ -53,11 +53,19 @@ spec:
5353
container:
5454
type: string
5555
maxCheckpointSize:
56-
type: integer
56+
anyOf:
57+
- type: integer
58+
- type: string
59+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
60+
x-kubernetes-int-or-string: true
5761
maxCheckpoints:
5862
type: integer
5963
maxTotalSize:
60-
type: integer
64+
anyOf:
65+
- type: integer
66+
- type: string
67+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
68+
x-kubernetes-int-or-string: true
6169
namespace:
6270
type: string
6371
pod:
@@ -69,31 +77,55 @@ spec:
6977
globalPolicy:
7078
properties:
7179
maxCheckpointSize:
72-
type: integer
80+
anyOf:
81+
- type: integer
82+
- type: string
83+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
84+
x-kubernetes-int-or-string: true
7385
maxCheckpointsPerContainer:
7486
type: integer
7587
maxCheckpointsPerNamespace:
7688
type: integer
7789
maxCheckpointsPerPod:
7890
type: integer
7991
maxTotalSizePerContainer:
80-
type: integer
92+
anyOf:
93+
- type: integer
94+
- type: string
95+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
96+
x-kubernetes-int-or-string: true
8197
maxTotalSizePerNamespace:
82-
type: integer
98+
anyOf:
99+
- type: integer
100+
- type: string
101+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
102+
x-kubernetes-int-or-string: true
83103
maxTotalSizePerPod:
84-
type: integer
104+
anyOf:
105+
- type: integer
106+
- type: string
107+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
108+
x-kubernetes-int-or-string: true
85109
retainOrphan:
86110
type: boolean
87111
type: object
88112
namespacePolicies:
89113
items:
90114
properties:
91115
maxCheckpointSize:
92-
type: integer
116+
anyOf:
117+
- type: integer
118+
- type: string
119+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
120+
x-kubernetes-int-or-string: true
93121
maxCheckpoints:
94122
type: integer
95123
maxTotalSize:
96-
type: integer
124+
anyOf:
125+
- type: integer
126+
- type: string
127+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
128+
x-kubernetes-int-or-string: true
97129
namespace:
98130
type: string
99131
retainOrphan:
@@ -104,11 +136,19 @@ spec:
104136
items:
105137
properties:
106138
maxCheckpointSize:
107-
type: integer
139+
anyOf:
140+
- type: integer
141+
- type: string
142+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
143+
x-kubernetes-int-or-string: true
108144
maxCheckpoints:
109145
type: integer
110146
maxTotalSize:
111-
type: integer
147+
anyOf:
148+
- type: integer
149+
- type: string
150+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
151+
x-kubernetes-int-or-string: true
112152
namespace:
113153
type: string
114154
pod:

config/rbac/role.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ rules:
88
- ""
99
resources:
1010
- namespaces
11-
verbs:
12-
- get
13-
- list
14-
- watch
15-
- apiGroups:
16-
- ""
17-
resources:
1811
- pods
1912
verbs:
2013
- get

0 commit comments

Comments
 (0)