WIP

Signed-off-by: Sebastian Sch <[email protected]>

Dockerfile

@@ -4,6 +4,7 @@ COPY . .
 RUN make _build-manager BIN_PATH=build/_output/cmd
 
 FROM quay.io/centos/centos:stream9
+RUN yum -y install delve procps-ng
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/manager /usr/bin/sriov-network-operator
 COPY bindata /bindata
 ENV OPERATOR_NAME=sriov-network-operator

Dockerfile.rhel7

@@ -0,0 +1,16 @@
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
+WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
+COPY . .
+RUN make _build-manager BIN_PATH=build/_output/cmd
+
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
+LABEL io.k8s.display-name="OpenShift sriov-network-operator" \
+ io.k8s.description="This is the component that manange and config sriov component in Openshift cluster" \
+ io.openshift.tags="openshift,networking,sr-iov" \
+ com.redhat.delivery.appregistry=true \
+ maintainer="Multus team <[email protected]>"
+COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/manager /usr/bin/sriov-network-operator
+COPY bindata /bindata
+ENV OPERATOR_NAME=sriov-network-operator
+ENV CLUSTER_TYPE=openshift
+CMD ["/usr/bin/sriov-network-operator"]

Dockerfile.sriov-network-config-daemon

@@ -7,7 +7,7 @@ FROM quay.io/centos/centos:stream9
 ARG MSTFLINT=mstflint
 # We have to ensure that pciutils is installed. This package is needed for mstfwreset to succeed.
 # xref pkg/vendors/mellanox/mellanox.go#L150
-RUN ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n ${MSTFLINT} ; fi) && yum -y install hwdata pciutils $ARCH_DEP_PKGS && yum clean all
+RUN ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n ${MSTFLINT} ; fi) && yum -y install delve procps-ng hwdata pciutils $ARCH_DEP_PKGS && yum clean all
 LABEL io.k8s.display-name="sriov-network-config-daemon" \
  io.k8s.description="This is a daemon that manage and config sriov network devices in Kubernetes cluster"
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/sriov-network-config-daemon /usr/bin/

Dockerfile.sriov-network-config-daemon.rhel7

@@ -0,0 +1,16 @@
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
+WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
+COPY . .
+RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd
+
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
+RUN yum -y update && ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n mstflint ; fi) && yum -y install pciutils hwdata $ARCH_DEP_PKGS && yum clean all
+LABEL io.k8s.display-name="OpenShift sriov-network-config-daemon" \
+ io.k8s.description="This is a daemon that manage and config sriov network devices in Openshift cluster" \
+ io.openshift.tags="openshift,networking,sr-iov" \
+ maintainer="Multus team <[email protected]>"
+COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/sriov-network-config-daemon /usr/bin/
+COPY bindata /bindata
+ENV PLUGINSPATH=/plugins
+ENV CLUSTER_TYPE=openshift
+CMD ["/usr/bin/sriov-network-config-daemon"]

Dockerfile.webhook.rhel7

@@ -0,0 +1,13 @@
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
+WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
+COPY . .
+RUN make _build-webhook BIN_PATH=build/_output/cmd
+
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
+LABEL io.k8s.display-name="OpenShift sriov-network-webhook" \
+ io.k8s.description="This is an admission controller webhook that mutates and validates customer resources of sriov network operator." \
+ io.openshift.tags="openshift,networking,sr-iov" \
+ maintainer="Multus team <[email protected]>"
+COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/webhook /usr/bin/webhook
+ENV CLUSTER_TYPE=openshift
+CMD ["/usr/bin/webhook"]

bindata/manifests/daemon/daemonset.yaml

@@ -130,10 +130,22 @@ spec:
  containers:
  - name: sriov-network-config-daemon
  image: {{.Image}}
- command:
- - sriov-network-config-daemon
+ imagePullPolicy: Always
+# command:
+# - dlv
+# - --listen=:2345
+# - --headless=true
+# - --api-version=2
+# - --accept-multiclient
+# - --log
+# - exec
+# - /usr/bin/sriov-network-config-daemon
+# - --
+# - start
  securityContext:
  privileged: true
+ command:
+ - sriov-network-config-daemon
  args:
  - "start"
  {{- if .UsedSystemdMode}}

bindata/manifests/operator-webhook/server.yaml

@@ -64,6 +64,7 @@ spec:
  containers:
  - name: webhook-server
  image: {{.SriovNetworkWebhookImage}}
+ imagePullPolicy: Always
  command:
  - webhook
  args:

bindata/manifests/plugins/sriov-device-plugin.yaml

@@ -42,6 +42,7 @@ spec:
  containers:
  - name: sriov-device-plugin
  image: {{.SRIOVDevicePluginImage}}
+ imagePullPolicy: Always
  args:
  - --log-level=10
  - --resource-prefix={{.ResourcePrefix}}

bindata/manifests/webhook/server.yaml

@@ -67,6 +67,7 @@ spec:
  containers:
  - name: webhook-server
  image: {{.NetworkResourcesInjectorImage}}
+ imagePullPolicy: Always
  command:
  - webhook
  args: