Skip to content

Commit cbcb551

Browse files
almaslennikovalmaslennikov
authored
Merge branch 'k8snetworkplumbingwg:master' into master
2 parents 01f3144 + d09059f commit cbcb551

36 files changed

+458
-148
lines changed

‎.github/workflows/test.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-24.04
1414
steps:
1515

16-
- name: Set up Go 1.24
16+
- name: Set up Go 1.25
1717
uses: actions/setup-go@v6
1818
with:
19-
go-version: 1.24.x
19+
go-version: 1.25.x
2020

2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@v6
@@ -32,10 +32,10 @@ jobs:
3232
runs-on: ubuntu-24.04
3333
steps:
3434

35-
- name: Set up Go 1.24
35+
- name: Set up Go 1.25
3636
uses: actions/setup-go@v6
3737
with:
38-
go-version: 1.24.x
38+
go-version: 1.25.x
3939

4040
- name: Check out code into the Go module directory
4141
uses: actions/checkout@v6
@@ -72,10 +72,10 @@ jobs:
7272
runs-on: ubuntu-24.04
7373
steps:
7474

75-
- name: Set up Go 1.24
75+
- name: Set up Go 1.25
7676
uses: actions/setup-go@v6
7777
with:
78-
go-version: 1.24.x
78+
go-version: 1.25.x
7979

8080
- name: Check out code into the Go module directory
8181
uses: actions/checkout@v6
@@ -97,10 +97,10 @@ jobs:
9797
name: Golangci-lint
9898
runs-on: ubuntu-24.04
9999
steps:
100-
- name: Set up Go 1.24
100+
- name: Set up Go 1.25
101101
uses: actions/setup-go@v6
102102
with:
103-
go-version: 1.24.x
103+
go-version: 1.25.x
104104
- name: Check out code into the Go module directory
105105
uses: actions/checkout@v6
106106
- name: run lint checks
@@ -140,10 +140,10 @@ jobs:
140140
runs-on: ubuntu-24.04
141141
steps:
142142

143-
- name: Set up Go 1.24
143+
- name: Set up Go 1.25
144144
uses: actions/setup-go@v6
145145
with:
146-
go-version: 1.24.x
146+
go-version: 1.25.x
147147

148148
- name: Check out code into the Go module directory
149149
uses: actions/checkout@v6
@@ -195,10 +195,10 @@ jobs:
195195
- name: Check out code into the Go module directory
196196
uses: actions/checkout@v6
197197

198-
- name: Set up Go 1.24
198+
- name: Set up Go 1.25
199199
uses: actions/setup-go@v6
200200
with:
201-
go-version: 1.24.x
201+
go-version: 1.25.x
202202

203203
- name: run test
204204
run: make test-e2e-conformance-virtual-k8s-cluster-ci
@@ -229,10 +229,10 @@ jobs:
229229
- name: Check out code into the Go module directory
230230
uses: actions/checkout@v6
231231

232-
- name: Set up Go 1.24
232+
- name: Set up Go 1.25
233233
uses: actions/setup-go@v6
234234
with:
235-
go-version: 1.24.x
235+
go-version: 1.25.x
236236

237237
- name: run test
238238
run: make test-e2e-conformance-virtual-ocp-cluster-ci

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GOLANGCI_LINT = $(BIN_DIR)/golangci-lint
5656
# golangci-lint version should be updated periodically
5757
# we keep it fixed to avoid it from unexpectedly failing on the project
5858
# in case of a version bump
59-
GOLANGCI_LINT_VER = v2.6.2
59+
GOLANGCI_LINT_VER = v2.7.2
6060

6161
.PHONY: all build clean gendeepcopy test test-e2e test-e2e-k8s run image fmt sync-manifests test-e2e-conformance manifests update-codegen
6262

@@ -139,7 +139,7 @@ mock-generate: gomock
139139

140140
CONTROLLER_GEN = $(BIN_DIR)/controller-gen
141141
controller-gen: ## Download controller-gen locally if necessary.
142-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0)
142+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.20.0)
143143

144144
ENVTEST = $(BIN_DIR)/setup-envtest
145145
envtest: ## Download envtest-setup locally if necessary.
@@ -259,7 +259,7 @@ $(BIN_DIR):
259259
@mkdir -p $(BIN_DIR)
260260

261261
YQ=$(BIN_DIR)/yq
262-
YQ_VERSION=v4.44.1
262+
YQ_VERSION=v4.50.1
263263
$(YQ): | $(BIN_DIR); $(info installing yq)
264264
@curl -fsSL -o $(YQ) https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_linux_amd64 && chmod +x $(YQ)
265265

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ nodes in parallel from the pool the operator can drain in parallel. maxUnavailab
464464

465465
> **NOTE**: If a node is not part of any pool it will have a default configuration of maxUnavailable 1
466466

467+
> **NOTE**: Node draining can be delegated to an external drain-controller by setting `USE_EXTERNAL_DRAINER=true` (e.g. using [NVIDIA maintenance-operator](https://github.com/Mellanox/maintenance-operator)) (PR #952). This means that internal drain-controller continues to work on nodeState objects which were not annotated with `sriovnetwork.openshift.io/use-external-drainer`. In addition, `SriovNetworkPoolConfig` will not take any effect during drain procedure, since the maintenance operator will be in charge of [parallel node operations](https://github.com/Mellanox/maintenance-operator/blob/main/api/v1alpha1/maintenanceoperatorconfig_types.go#L38-L46).
467468

468469
#### RDMA Mode Configuration
469470

‎bindata/manifests/daemon/daemonset.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ spec:
186186
value: "{{.ClusterType}}"
187187
- name: DEV_MODE
188188
value: "{{.DevMode}}"
189+
{{- if .UseExternalDrainer }}
190+
- name: USE_EXTERNAL_DRAINER
191+
value: "{{.UseExternalDrainer}}"
192+
{{- end }}
189193
{{- range $key, $value := .ConfigDaemonEnvVars }}
190194
- name: {{ $key }}
191195
value: "{{ $value }}"

‎config/crd/bases/sriovnetwork.openshift.io_ovsnetworks.yaml‎

Lines changed: 1 addition & 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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: ovsnetworks.sriovnetwork.openshift.io
88
spec:
99
group: sriovnetwork.openshift.io

‎config/crd/bases/sriovnetwork.openshift.io_sriovibnetworks.yaml‎

Lines changed: 1 addition & 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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: sriovibnetworks.sriovnetwork.openshift.io
88
spec:
99
group: sriovnetwork.openshift.io

‎config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml‎

Lines changed: 1 addition & 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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: sriovnetworknodepolicies.sriovnetwork.openshift.io
88
spec:
99
group: sriovnetwork.openshift.io

‎config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodestates.yaml‎

Lines changed: 1 addition & 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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: sriovnetworknodestates.sriovnetwork.openshift.io
88
spec:
99
group: sriovnetwork.openshift.io

‎config/crd/bases/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml‎

Lines changed: 1 addition & 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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: sriovnetworkpoolconfigs.sriovnetwork.openshift.io
88
spec:
99
group: sriovnetwork.openshift.io

‎config/crd/bases/sriovnetwork.openshift.io_sriovnetworks.yaml‎

Lines changed: 1 addition & 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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: sriovnetworks.sriovnetwork.openshift.io
88
spec:
99
group: sriovnetwork.openshift.io

0 commit comments

Comments
 (0)