Skip to content

Commit 762d43f

Browse files
e0nee0ne
authored
Merge pull request #434 from e0ne/1.4.0-bundle
Update OCP bundle for v1.4.0
2 parents 4fcb7c7 + 1cc9bed commit 762d43f

8 files changed

+118
-37
lines changed

‎bundle/manifests/mellanox.com_hostdevicenetworks.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.4.1
5+
controller-gen.kubebuilder.io/version: v0.10.0
66
creationTimestamp: null
77
name: hostdevicenetworks.mellanox.com
88
spec:
@@ -100,5 +100,5 @@ status:
100100
acceptedNames:
101101
kind: ""
102102
plural: ""
103-
conditions: []
104-
storedVersions: []
103+
conditions: null
104+
storedVersions: null

‎bundle/manifests/mellanox.com_ipoibnetworks.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.4.1
5+
controller-gen.kubebuilder.io/version: v0.10.0
66
creationTimestamp: null
77
name: ipoibnetworks.mellanox.com
88
spec:
@@ -80,5 +80,5 @@ status:
8080
acceptedNames:
8181
kind: ""
8282
plural: ""
83-
conditions: []
84-
storedVersions: []
83+
conditions: null
84+
storedVersions: null

‎bundle/manifests/mellanox.com_macvlannetworks.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.4.1
5+
controller-gen.kubebuilder.io/version: v0.10.0
66
creationTimestamp: null
77
name: macvlannetworks.mellanox.com
88
spec:
@@ -94,5 +94,5 @@ status:
9494
acceptedNames:
9595
kind: ""
9696
plural: ""
97-
conditions: []
98-
storedVersions: []
97+
conditions: null
98+
storedVersions: null

‎bundle/manifests/mellanox.com_nicclusterpolicies.yaml‎

Lines changed: 54 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.4.1
5+
controller-gen.kubebuilder.io/version: v0.10.0
66
creationTimestamp: null
77
name: nicclusterpolicies.mellanox.com
88
spec:
@@ -41,6 +41,42 @@ spec:
4141
spec:
4242
description: NicClusterPolicySpec defines the desired state of NicClusterPolicy
4343
properties:
44+
ibKubernetes:
45+
description: IBKubernetesSpec describes configuration options for
46+
ib-kubernetes
47+
properties:
48+
image:
49+
pattern: '[a-zA-Z0-9\-]+'
50+
type: string
51+
imagePullSecrets:
52+
items:
53+
type: string
54+
type: array
55+
pKeyGUIDPoolRangeEnd:
56+
description: The last guid in the pool
57+
type: string
58+
pKeyGUIDPoolRangeStart:
59+
description: The first guid in the pool
60+
type: string
61+
periodicUpdateSeconds:
62+
default: 5
63+
description: Interval of updates in seconds
64+
minimum: 0
65+
type: integer
66+
repository:
67+
pattern: '[a-zA-Z0-9\.\-\/]+'
68+
type: string
69+
ufmSecret:
70+
description: Secret containing credentials to UFM service
71+
type: string
72+
version:
73+
pattern: '[a-zA-Z0-9\.-]+'
74+
type: string
75+
required:
76+
- image
77+
- repository
78+
- version
79+
type: object
4480
nodeAffinity:
4581
description: Node affinity is a group of node affinity scheduling
4682
rules.
@@ -135,6 +171,7 @@ spec:
135171
type: object
136172
type: array
137173
type: object
174+
x-kubernetes-map-type: atomic
138175
weight:
139176
description: Weight associated with matching the corresponding
140177
nodeSelectorTerm, in the range 1-100.
@@ -230,10 +267,12 @@ spec:
230267
type: object
231268
type: array
232269
type: object
270+
x-kubernetes-map-type: atomic
233271
type: array
234272
required:
235273
- nodeSelectorTerms
236274
type: object
275+
x-kubernetes-map-type: atomic
237276
type: object
238277
nvPeerDriver:
239278
description: NVPeerDriverSpec describes configuration options for
@@ -284,13 +323,14 @@ spec:
284323
type: string
285324
value:
286325
description: 'Variable references $(VAR_NAME) are expanded
287-
using the previous defined environment variables in the
288-
container and any service environment variables. If a
289-
variable cannot be resolved, the reference in the input
290-
string will be unchanged. The $(VAR_NAME) syntax can be
291-
escaped with a double $$, ie: $$(VAR_NAME). Escaped references
292-
will never be expanded, regardless of whether the variable
293-
exists or not. Defaults to "".'
326+
using the previously defined environment variables in
327+
the container and any service environment variables. If
328+
a variable cannot be resolved, the reference in the input
329+
string will be unchanged. Double $$ are reduced to a single
330+
$, which allows for escaping the $(VAR_NAME) syntax: i.e.
331+
"$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
332+
Escaped references will never be expanded, regardless
333+
of whether the variable exists or not. Defaults to "".'
294334
type: string
295335
valueFrom:
296336
description: Source for the environment variable's value.
@@ -314,6 +354,7 @@ spec:
314354
required:
315355
- key
316356
type: object
357+
x-kubernetes-map-type: atomic
317358
fieldRef:
318359
description: 'Selects a field of the pod: supports metadata.name,
319360
metadata.namespace, `metadata.labels[''<KEY>'']`,
@@ -332,6 +373,7 @@ spec:
332373
required:
333374
- fieldPath
334375
type: object
376+
x-kubernetes-map-type: atomic
335377
resourceFieldRef:
336378
description: 'Selects a resource of the container: only
337379
resources limits and requests (limits.cpu, limits.memory,
@@ -356,6 +398,7 @@ spec:
356398
required:
357399
- resource
358400
type: object
401+
x-kubernetes-map-type: atomic
359402
secretKeyRef:
360403
description: Selects a key of a secret in the pod's
361404
namespace
@@ -376,6 +419,7 @@ spec:
376419
required:
377420
- key
378421
type: object
422+
x-kubernetes-map-type: atomic
379423
type: object
380424
required:
381425
- name
@@ -692,5 +736,5 @@ status:
692736
acceptedNames:
693737
kind: ""
694738
plural: ""
695-
conditions: []
696-
storedVersions: []
739+
conditions: null
740+
storedVersions: null

‎bundle/manifests/nvidia-network-operator-controller-manager-metrics-service_v1_service.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ spec:
99
ports:
1010
- name: https
1111
port: 8443
12+
protocol: TCP
1213
targetPort: https
1314
selector:
1415
control-plane: controller-manager

‎bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,32 @@ metadata:
7575
},
7676
"maxParallelUpgrades": 1
7777
},
78-
"version": "5.7-1.0.2.0"
78+
"version": "5.8-1.0.1.1.2"
7979
},
8080
"rdmaSharedDevicePlugin": {
8181
"config": "{\n \"configList\": [\n {\n \"resourceName\": \"rdma_shared_device_a\",\n \"rdmaHcaMax\": 1000,\n \"selectors\": {\n \"ifNames\": [\"ens2f0\"]\n }\n }\n ]\n}\n",
8282
"image": "k8s-rdma-shared-dev-plugin",
8383
"repository": "nvcr.io/nvidia/cloud-native",
8484
"version": "v1.3.2"
85+
},
86+
"sriovDevicePlugin": {
87+
"config": "{\n \"resourceList\": [\n {\n \"resourcePrefix\": \"nvidia.com\",\n \"resourceName\": \"hostdev\",\n \"selectors\": {\n \"vendors\": [\"15b3\"],\n \"isRdma\": true\n }\n }\n ]\n}\n",
88+
"image": "sriov-device-plugin",
89+
"repository": "ghcr.io/k8snetworkplumbingwg",
90+
"version": "v3.5.1"
8591
}
8692
}
8793
}
8894
]
8995
capabilities: Basic Install
9096
description: Deploy and manage NVIDIA networking resources in Kubernetes
9197
operatorframework.io/suggested-namespace: nvidia-network-operator
92-
operators.operatorframework.io/builder: operator-sdk-v1.7.1+git
98+
operators.operatorframework.io/builder: operator-sdk-v1.22.0
9399
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
94100
provider: NVIDIA
95101
repository: https://github.com/Mellanox/network-operator/
96102
support: NVIDIA
97-
name: nvidia-network-operator.v1.3.0
103+
name: nvidia-network-operator.v1.4.0
98104
namespace: placeholder
99105
spec:
100106
apiservicedefinitions: {}
@@ -439,7 +445,9 @@ spec:
439445
- create
440446
serviceAccountName: nvidia-network-operator-controller-manager
441447
deployments:
442-
- name: nvidia-network-operator-controller-manager
448+
- label:
449+
control-plane: controller-manager
450+
name: nvidia-network-operator-controller-manager
443451
spec:
444452
replicas: 1
445453
selector:
@@ -448,6 +456,8 @@ spec:
448456
strategy: {}
449457
template:
450458
metadata:
459+
annotations:
460+
kubectl.kubernetes.io/default-container: manager
451461
labels:
452462
control-plane: controller-manager
453463
nvidia.com/ofed-upgrade.skip-drain: "true"
@@ -457,20 +467,26 @@ spec:
457467
- --secure-listen-address=0.0.0.0:8443
458468
- --upstream=http://127.0.0.1:8080/
459469
- --logtostderr=true
460-
- --v=10
470+
- --v=0
461471
image: gcr.io/kubebuilder/kube-rbac-proxy@sha256:db06cc4c084dd0253134f156dddaaf53ef1c3fb3cc809e5d81711baa4029ea4c
462472
name: kube-rbac-proxy
463473
ports:
464474
- containerPort: 8443
465475
name: https
466-
resources: {}
476+
resources:
477+
limits:
478+
cpu: 500m
479+
memory: 128Mi
480+
requests:
481+
cpu: 5m
482+
memory: 64Mi
467483
- args:
468484
- --health-probe-bind-address=:8081
469485
- --metrics-bind-address=127.0.0.1:8080
470486
- --leader-elect
471487
command:
472488
- /manager
473-
image: nvcr.io/nvidia/cloud-native/network-operator@sha256:c994ad8894deacb61ca9dcea8983376f89750681a0c185ba860c9b6c0045c28c
489+
image: nvcr.io/nvidia/cloud-native/network-operator@sha256:26d86d5ecccae0abb8003c06d17b6e6083a154350bebdabb5755149a86869224
474490
imagePullPolicy: IfNotPresent
475491
livenessProbe:
476492
httpGet:
@@ -487,11 +503,11 @@ spec:
487503
periodSeconds: 10
488504
resources:
489505
limits:
490-
cpu: 300m
491-
memory: 100Mi
506+
cpu: 500m
507+
memory: 128Mi
492508
requests:
493-
cpu: 200m
494-
memory: 50Mi
509+
cpu: 5m
510+
memory: 64M
495511
securityContext:
496512
allowPrivilegeEscalation: false
497513
securityContext:
@@ -558,11 +574,10 @@ spec:
558574
name: NVIDIA
559575
url: https://github.com/Mellanox/network-operator/
560576
relatedImages:
561-
- image: nvcr.io/nvidia/mellanox/mofed@sha256:b9a6d20434443b364a4426f61cdec3fda5d793fbfb3fe6607ebeafc80d5dbbd8
577+
- image: nvcr.io/nvidia/mellanox/mofed@sha256:ice-plugin@sha256:3094dfbe6dac173d8d3373da29ba9173d5949665ea80b29c4909bc5d586ac82b
562578
name: mofed
563579
- image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin@sha256:f717f9778f48665b7c592f2225df51b755a1fe048125e034a286c564ee10fd37
564580
name: sriov-network-device-plugin
565581
- image: nvcr.io/nvidia/cloud-native/k8s-rdma-shared-dev-plugin@sha256:941ad9ff5013e9e7ad5abeb0ea9f79d45379cfae88a628d923f87d2259bdd132
566582
name: rdma-shared-device-plugin
567-
version: 1.3.0
568-
replaces: nvidia-network-operator.v1.2.1
583+
version: 1.4.0

‎bundle/metadata/annotations.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ annotations:
44
operators.operatorframework.io.bundle.manifests.v1: manifests/
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: nvidia-network-operator
7-
operators.operatorframework.io.bundle.channels.v1: v1.3.0
8-
operators.operatorframework.io.bundle.channel.default.v1: v1.3.0
9-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.7.1+git
7+
operators.operatorframework.io.bundle.channels.v1: v1.4.0
8+
operators.operatorframework.io.bundle.channel.default.v1: v1.4.0
9+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1111
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1212

13-
com.redhat.openshift.versions: =4.10
13+
com.redhat.openshift.versions: v4.10-4.11
1414
# Annotations for testing.
1515
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
1616
operators.operatorframework.io.test.config.v1: tests/scorecard/

‎bundle/tests/scorecard/config.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,59 @@ stages:
1212
labels:
1313
suite: basic
1414
test: basic-check-spec-test
15+
storage:
16+
spec:
17+
mountPath: {}
1518
- entrypoint:
1619
- scorecard-test
1720
- olm-bundle-validation
1821
image: quay.io/operator-framework/scorecard-test:v1.8.0
1922
labels:
2023
suite: olm
2124
test: olm-bundle-validation-test
25+
storage:
26+
spec:
27+
mountPath: {}
2228
- entrypoint:
2329
- scorecard-test
2430
- olm-crds-have-validation
2531
image: quay.io/operator-framework/scorecard-test:v1.8.0
2632
labels:
2733
suite: olm
2834
test: olm-crds-have-validation-test
35+
storage:
36+
spec:
37+
mountPath: {}
2938
- entrypoint:
3039
- scorecard-test
3140
- olm-crds-have-resources
3241
image: quay.io/operator-framework/scorecard-test:v1.8.0
3342
labels:
3443
suite: olm
3544
test: olm-crds-have-resources-test
45+
storage:
46+
spec:
47+
mountPath: {}
3648
- entrypoint:
3749
- scorecard-test
3850
- olm-spec-descriptors
3951
image: quay.io/operator-framework/scorecard-test:v1.8.0
4052
labels:
4153
suite: olm
4254
test: olm-spec-descriptors-test
55+
storage:
56+
spec:
57+
mountPath: {}
4358
- entrypoint:
4459
- scorecard-test
4560
- olm-status-descriptors
4661
image: quay.io/operator-framework/scorecard-test:v1.8.0
4762
labels:
4863
suite: olm
4964
test: olm-status-descriptors-test
65+
storage:
66+
spec:
67+
mountPath: {}
68+
storage:
69+
spec:
70+
mountPath: {}

0 commit comments

Comments
 (0)