Skip to content

Feat/upstream k8s portability#1

Open
SamD2021 wants to merge 11 commits intoopiproject:mainfrom
SamD2021:feat/upstream-k8s-portability
Open

Feat/upstream k8s portability#1
SamD2021 wants to merge 11 commits intoopiproject:mainfrom
SamD2021:feat/upstream-k8s-portability

Conversation

@SamD2021
Copy link
Copy Markdown
Collaborator

No description provided.

@SamD2021 SamD2021 force-pushed the feat/upstream-k8s-portability branch 3 times, most recently from 8990461 to b8ac221 Compare March 18, 2026 18:45
@wizhaoredhat
Copy link
Copy Markdown
Contributor

I would copy the entire DPU Operator from OpenShift. Not just having the manifests and such.

@SamD2021 SamD2021 force-pushed the feat/upstream-k8s-portability branch 6 times, most recently from 66e4349 to 3eafae3 Compare March 30, 2026 17:35
@SamD2021 SamD2021 self-assigned this Apr 1, 2026
@SamD2021 SamD2021 requested a review from wizhaoredhat April 1, 2026 18:26
@SamD2021 SamD2021 marked this pull request as ready for review April 1, 2026 18:26
@SamD2021 SamD2021 requested a review from wizhaoredhat April 6, 2026 16:52
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
}
"range_end": "10.56.217.150",
"kubernetes": {
"kubeconfig": "/etc/cni/net.d/whereabouts.d/whereabouts.kubeconfig"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks strange... Could you explain why this is needed?

-output-file bin/local-images.yaml
- cp config/dev/kustomization.yaml bin

deploy-webhook-compat:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name of this task doesn't really tell the read what it does. Please add commentary

- bin/kustomize build bin | KUBECONFIG="{{.KUBECONFIG_HOST}}" oc apply -f -
- KUBECONFIG="{{.KUBECONFIG_HOST}}" oc -n openshift-dpu-operator wait --for=condition=Available deployment/dpu-operator-controller-manager --timeout=300s
- KUBECONFIG="{{.KUBECONFIG_HOST}}" oc -n openshift-dpu-operator wait --for=condition=ready pod --all --timeout=300s
- bin/kustomize build bin | KUBECONFIG="{{.KUBECONFIG_HOST}}" kubectl apply -f -
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kubectl and oc should be allowed. Meaning we should have a it defined as $OCI_BIN and we can detect which is installed.

return p.wrap("/run/cni"), nil
// OpenShift typically uses /var/lib/cni regardless of filesystem mode since nodes are always coreos based
case clusterFlavour == OpenShiftFlavour:
case clusterFlavour == OpenShiftFlavour || (clusterFlavour == VanillaFlavour && filesystemMode == ImageMode):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VanillaFlavour is confusing...

@@ -0,0 +1,13 @@
package utils
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need a new file for this?

- ../webhook
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
#- ../certmanager
- ../certmanager
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does upstream sriov network operator and downstream sriov network operator handle this?

SamD2021 added 8 commits April 8, 2026 14:16
… switching

- add non-.rhel Dockerfiles for manager/daemon/VSP/NRI images
- keep .rhel Dockerfiles unchanged and selectable via DOCKERFILE_SUFFIX
- add build-image-all-rhel and clean-image-all-rhel wrappers
- make REGISTRY overridable in taskfile
- fix pip RPM-setuptools conflict in openshift/install-dpu.sh

Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
- add PUSH_TLS_VERIFY (default true) to push-image-helper
- allow --tls-verify=false for insecure local registries
- unset GOOS/GOARCH for go-install tool tasks (kustomize/ginkgo/controller-gen/envtest)

Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
- replace oc with kubectl in taskfile deploy and undeploy paths
- update README example command accordingly

Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
SamD2021 added 2 commits April 8, 2026 14:16
Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
…ader lock

Adds ipam.kubernetes.kubeconfig=/etc/cni/net.d/whereabouts.d/whereabouts.kubeconfig
to the host NAD template so dpu-cni uses the intended Whereabouts identity across 
vanilla/OpenShift-style environments, preventing time limit exceeded while waiting
to become leader during pod network setup.

Signed-off-by: Sam DaSilva <sam.ramos.dasilva@gmail.com>
@SamD2021 SamD2021 force-pushed the feat/upstream-k8s-portability branch from 3eafae3 to 099b1d1 Compare April 8, 2026 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants