Skip to content

Commit 69b8ee7

Browse files
e0nee0ne
authored
Merge pull request #323 from rollandf/alm-examples
Add alm-examples to OLM bundle
2 parents 5902742 + 3d8bfbe commit 69b8ee7

File tree

4 files changed

+152
-15
lines changed

4 files changed

+152
-15
lines changed

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

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,64 @@ metadata:
88
"apiVersion": "mellanox.com/v1alpha1",
99
"kind": "HostDeviceNetwork",
1010
"metadata": {
11-
"name": "hostdevicenetwork-sample"
11+
"name": "example-hostdevice-network"
1212
},
1313
"spec": {
14-
"foo": "bar"
14+
"ipam": "{\n \"type\": \"whereabouts\",\n \"range\": \"192.168.3.225/28\",\n \"exclude\": [\n \"192.168.3.229/30\",\n \"192.168.3.236/32\"\n ]\n}\n",
15+
"networkNamespace": "default",
16+
"resourceName": "hostdev"
1517
}
1618
},
1719
{
1820
"apiVersion": "mellanox.com/v1alpha1",
1921
"kind": "MacvlanNetwork",
2022
"metadata": {
21-
"name": "macvlannetwork-sample"
23+
"name": "example-macvlannetwork"
2224
},
2325
"spec": {
24-
"foo": "bar"
26+
"ipam": "{\n \"type\": \"whereabouts\",\n \"range\": \"192.168.2.225/24\",\n \"exclude\": [\n \"192.168.2.229/30\",\n \"192.168.2.236/32\"\n ]\n}\n",
27+
"master": "ens2f0",
28+
"mode": "bridge",
29+
"mtu": 1500,
30+
"networkNamespace": "default"
2531
}
2632
},
2733
{
2834
"apiVersion": "mellanox.com/v1alpha1",
2935
"kind": "NicClusterPolicy",
3036
"metadata": {
31-
"name": "nicclusterpolicy-sample"
37+
"name": "nic-cluster-policy"
3238
},
3339
"spec": {
34-
"foo": "bar"
40+
"ofedDriver": {
41+
"image": "mofed",
42+
"livenessProbe": {
43+
"initialDelaySeconds": 30,
44+
"periodSeconds": 30
45+
},
46+
"readinessProbe": {
47+
"initialDelaySeconds": 10,
48+
"periodSeconds": 30
49+
},
50+
"repository": "mellanox",
51+
"startupProbe": {
52+
"initialDelaySeconds": 10,
53+
"periodSeconds": 20
54+
},
55+
"version": "5.5-1.0.3.2"
56+
},
57+
"rdmaSharedDevicePlugin": {
58+
"config": "{\n \"configList\": [\n {\n \"resourceName\": \"rdma_shared_device_a\",\n \"rdmaHcaMax\": 1000,\n \"selectors\": {\n \"ifNames\": [\"ens2f0\"]\n }\n }\n ]\n}\n",
59+
"image": "k8s-rdma-shared-dev-plugin",
60+
"repository": "nvcr.io/nvidia/cloud-native",
61+
"version": "v1.2.1-ubi"
62+
},
63+
"sriovDevicePlugin": {
64+
"config": "{\n \"resourceList\": [\n {\n \"resourcePrefix\": \"nvidia.com\",\n \"resourceName\": \"hostdev\",\n \"selectors\": {\n \"vendors\": [\"15b3\"],\n \"isRdma\": true\n }\n }\n ]\n}\n",
65+
"image": "sriov-device-plugin",
66+
"repository": "docker.io/nfvpe",
67+
"version": "v3.3"
68+
}
3569
}
3670
}
3771
]

‎config/samples/mellanox.com_v1alpha1_hostdevicenetwork.yaml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,29 @@
1+
# Copyright 2021 NVIDIA
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
114
apiVersion: mellanox.com/v1alpha1
215
kind: HostDeviceNetwork
316
metadata:
4-
name: hostdevicenetwork-sample
17+
name: example-hostdevice-network
518
spec:
6-
# Add fields here
7-
foo: bar
19+
networkNamespace: "default"
20+
resourceName: "hostdev"
21+
ipam: |
22+
{
23+
"type": "whereabouts",
24+
"range": "192.168.3.225/28",
25+
"exclude": [
26+
"192.168.3.229/30",
27+
"192.168.3.236/32"
28+
]
29+
}

‎config/samples/mellanox.com_v1alpha1_macvlannetwork.yaml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
1+
# Copyright 2021 NVIDIA
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
114
apiVersion: mellanox.com/v1alpha1
215
kind: MacvlanNetwork
316
metadata:
4-
name: macvlannetwork-sample
17+
name: example-macvlannetwork
518
spec:
6-
# Add fields here
7-
foo: bar
19+
networkNamespace: "default"
20+
master: "ens2f0"
21+
mode: "bridge"
22+
mtu: 1500
23+
ipam: |
24+
{
25+
"type": "whereabouts",
26+
"range": "192.168.2.225/24",
27+
"exclude": [
28+
"192.168.2.229/30",
29+
"192.168.2.236/32"
30+
]
31+
}

‎config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml‎

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,64 @@
1+
# Copyright 2021 NVIDIA
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
114
apiVersion: mellanox.com/v1alpha1
215
kind: NicClusterPolicy
316
metadata:
4-
name: nicclusterpolicy-sample
17+
name: nic-cluster-policy
518
spec:
6-
# Add fields here
7-
foo: bar
19+
ofedDriver:
20+
image: mofed
21+
repository: mellanox
22+
version: 5.5-1.0.3.2
23+
startupProbe:
24+
initialDelaySeconds: 10
25+
periodSeconds: 20
26+
livenessProbe:
27+
initialDelaySeconds: 30
28+
periodSeconds: 30
29+
readinessProbe:
30+
initialDelaySeconds: 10
31+
periodSeconds: 30
32+
sriovDevicePlugin:
33+
image: sriov-device-plugin
34+
repository: docker.io/nfvpe
35+
version: v3.3
36+
config: |
37+
{
38+
"resourceList": [
39+
{
40+
"resourcePrefix": "nvidia.com",
41+
"resourceName": "hostdev",
42+
"selectors": {
43+
"vendors": ["15b3"],
44+
"isRdma": true
45+
}
46+
}
47+
]
48+
}
49+
rdmaSharedDevicePlugin:
50+
image: k8s-rdma-shared-dev-plugin
51+
repository: nvcr.io/nvidia/cloud-native
52+
version: v1.2.1-ubi
53+
config: |
54+
{
55+
"configList": [
56+
{
57+
"resourceName": "rdma_shared_device_a",
58+
"rdmaHcaMax": 1000,
59+
"selectors": {
60+
"ifNames": ["ens2f0"]
61+
}
62+
}
63+
]
64+
}

0 commit comments

Comments
 (0)