Skip to content

Commit 588a53b

Browse files
authored
chore: update Maintenance operator to 0.2.0 (Mellanox#1299)
2 parents 0aa18d9 + 99a8cfb commit 588a53b

File tree

8 files changed

+40
-61
lines changed

8 files changed

+40
-61
lines changed

deployment/network-operator/charts/maintenance-operator-chart/crds/maintenance.nvidia.com_maintenanceoperatorconfigs.yaml

Lines changed: 5 additions & 1 deletion
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.16.5
77
name: maintenanceoperatorconfigs.maintenance.nvidia.com
88
spec:
99
group: maintenance.nvidia.com
@@ -84,6 +84,10 @@ spec:
8484
new nodes will not be processed if the number of unavailable node will exceed this value
8585
x-kubernetes-int-or-string: true
8686
type: object
87+
status:
88+
type: object
8789
type: object
8890
served: true
8991
storage: true
92+
subresources:
93+
status: {}

deployment/network-operator/charts/maintenance-operator-chart/crds/maintenance.nvidia.com_nodemaintenances.yaml

Lines changed: 7 additions & 17 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.16.5
77
name: nodemaintenances.maintenance.nvidia.com
88
spec:
99
group: maintenance.nvidia.com
@@ -169,16 +169,8 @@ spec:
169169
description: Conditions represents observations of NodeMaintenance
170170
current state
171171
items:
172-
description: "Condition contains details for one aspect of the current
173-
state of this API Resource.\n---\nThis struct is intended for
174-
direct use as an array at the field path .status.conditions. For
175-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
176-
observations of a foo's current state.\n\t // Known .status.conditions.type
177-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
178-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
179-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
180-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
181-
\ // other fields\n\t}"
172+
description: Condition contains details for one aspect of the current
173+
state of this API Resource.
182174
properties:
183175
lastTransitionTime:
184176
description: |-
@@ -219,12 +211,7 @@ spec:
219211
- Unknown
220212
type: string
221213
type:
222-
description: |-
223-
type of condition in CamelCase or in foo.example.com/CamelCase.
224-
---
225-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
226-
useful (see .node.status.conditions), the ability to deconflict is important.
227-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
214+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
228215
maxLength: 316
229216
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])$
230217
type: string
@@ -279,6 +266,9 @@ spec:
279266
type: array
280267
type: object
281268
type: object
269+
selectableFields:
270+
- jsonPath: .spec.nodeName
271+
- jsonPath: .spec.requestorID
282272
served: true
283273
storage: true
284274
subresources:

deployment/network-operator/charts/maintenance-operator-chart/templates/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: {{ include "maintenance-operator.fullname" . }}
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
app.kubernetes.io/component: manager
7+
app.kubernetes.io/component: maintenance-operator-controller-manager
88
app.kubernetes.io/created-by: maintenance-operator
99
app.kubernetes.io/part-of: maintenance-operator
1010
control-plane: {{ .Release.Name }}-controller-manager
@@ -19,6 +19,7 @@ spec:
1919
metadata:
2020
labels:
2121
control-plane: {{ .Release.Name }}-controller-manager
22+
app.kubernetes.io/component: maintenance-operator-controller-manager
2223
{{- include "maintenance-operator.selectorLabels" . | nindent 8 }}
2324
annotations:
2425
kubectl.kubernetes.io/default-container: manager

deployment/network-operator/charts/maintenance-operator-chart/templates/role.yaml

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
1+
---
12
apiVersion: rbac.authorization.k8s.io/v1
23
kind: ClusterRole
34
metadata:
45
name: {{ include "maintenance-operator.fullname" . }}-manager-role
56
labels:
67
{{- include "maintenance-operator.labels" . | nindent 4 }}
78
rules:
8-
- apiGroups:
9-
- authentication.k8s.io
10-
resources:
11-
- tokenreviews
12-
verbs:
13-
- create
14-
- apiGroups:
15-
- authorization.k8s.io
16-
resources:
17-
- subjectaccessreviews
18-
verbs:
19-
- create
20-
- nonResourceURLs:
21-
- /metrics
22-
verbs:
23-
- get
249
- apiGroups:
2510
- ""
2611
resources:
@@ -62,34 +47,43 @@ rules:
6247
- patch
6348
- update
6449
- apiGroups:
65-
- maintenance.nvidia.com
50+
- apps
6651
resources:
67-
- maintenanceoperatorconfigs
52+
- daemonsets
6853
verbs:
69-
- create
70-
- delete
7154
- get
7255
- list
73-
- patch
74-
- update
7556
- watch
7657
- apiGroups:
77-
- maintenance.nvidia.com
58+
- config.openshift.io
7859
resources:
79-
- maintenanceoperatorconfigs/finalizers
60+
- infrastructures
8061
verbs:
81-
- update
62+
- get
63+
- list
64+
- watch
8265
- apiGroups:
83-
- maintenance.nvidia.com
66+
- machineconfiguration.openshift.io
8467
resources:
85-
- maintenanceoperatorconfigs/status
68+
- machineconfigpools
8669
verbs:
8770
- get
71+
- list
8872
- patch
8973
- update
74+
- watch
75+
- apiGroups:
76+
- machineconfiguration.openshift.io
77+
resources:
78+
- machineconfigs
79+
verbs:
80+
- get
81+
- list
82+
- watch
9083
- apiGroups:
9184
- maintenance.nvidia.com
9285
resources:
86+
- maintenanceoperatorconfigs
9387
- nodemaintenances
9488
verbs:
9589
- create
@@ -102,26 +96,19 @@ rules:
10296
- apiGroups:
10397
- maintenance.nvidia.com
10498
resources:
99+
- maintenanceoperatorconfigs/finalizers
105100
- nodemaintenances/finalizers
106101
verbs:
107102
- update
108103
- apiGroups:
109104
- maintenance.nvidia.com
110105
resources:
106+
- maintenanceoperatorconfigs/status
111107
- nodemaintenances/status
112108
verbs:
113109
- get
114110
- patch
115111
- update
116-
- apiGroups:
117-
- apps
118-
resources:
119-
- daemonsets
120-
verbs:
121-
- get
122-
- list
123-
- watch
124-
125112
---
126113
apiVersion: rbac.authorization.k8s.io/v1
127114
kind: Role

deployment/network-operator/charts/maintenance-operator-chart/templates/webhook.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ webhooks:
3333
name: '{{ include "maintenance-operator.fullname" . }}-webhook-service'
3434
namespace: {{ .Release.Namespace }}
3535
path: /validate-maintenance-nvidia-com-v1alpha1-nodemaintenance
36-
{{- if not .Values.operator.admissionController.certificates.certManager.enable }}
37-
caBundle: {{ .Values.operator.admissionController.certificates.custom.operator.tlsCrt | b64enc | quote }}
38-
{{- end }}
3936
failurePolicy: Fail
4037
name: vnodemaintenance.kb.io
4138
rules:

deployment/network-operator/charts/maintenance-operator-chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ operator:
5353
certManager:
5454
# -- use cert-manager for certificates
5555
enable: true
56-
# -- generate self-signed certificates with cert-manager
56+
# -- generate self-signed certificiates with cert-manager
5757
generateSelfSigned: true
5858
custom:
5959
# -- enable custom certificates using secrets

deployment/network-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ maintenance-operator-chart:
191191
image:
192192
repository: ghcr.io/mellanox
193193
name: maintenance-operator
194-
tag: v0.1.1
194+
tag: v0.2.0
195195
admissionController:
196196
# -- enable admission controller of the operator
197197
enable: false

hack/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ nicConfigurationConfigDaemon:
8989
maintenanceOperator:
9090
image: maintenance-operator
9191
repository: ghcr.io/mellanox
92-
version: v0.1.1
92+
version: v0.2.0

0 commit comments

Comments
 (0)