Skip to content

Commit 7d4e946

Browse files
SchSebaSchSeba
committed
WIP
Signed-off-by: Sebastian Sch <[email protected]>
1 parent 2e256c7 commit 7d4e946

29 files changed

+1271
-1158
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ COPY . .
44
RUN make _build-manager BIN_PATH=build/_output/cmd
55

66
FROM quay.io/centos/centos:stream9
7+
RUN yum -y install delve procps-ng
78
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/manager /usr/bin/sriov-network-operator
89
COPY bindata /bindata
910
ENV OPERATOR_NAME=sriov-network-operator

‎Dockerfile.rhel7‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
2+
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
3+
COPY . .
4+
RUN make _build-manager BIN_PATH=build/_output/cmd
5+
6+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
7+
LABEL io.k8s.display-name="OpenShift sriov-network-operator" \
8+
io.k8s.description="This is the component that manange and config sriov component in Openshift cluster" \
9+
io.openshift.tags="openshift,networking,sr-iov" \
10+
com.redhat.delivery.appregistry=true \
11+
maintainer="Multus team <[email protected]>"
12+
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/manager /usr/bin/sriov-network-operator
13+
COPY bindata /bindata
14+
ENV OPERATOR_NAME=sriov-network-operator
15+
ENV CLUSTER_TYPE=openshift
16+
CMD ["/usr/bin/sriov-network-operator"]

‎Dockerfile.sriov-network-config-daemon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM quay.io/centos/centos:stream9
77
ARG MSTFLINT=mstflint
88
# We have to ensure that pciutils is installed. This package is needed for mstfwreset to succeed.
99
# xref pkg/vendors/mellanox/mellanox.go#L150
10-
RUN ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n ${MSTFLINT} ; fi) && yum -y install hwdata pciutils $ARCH_DEP_PKGS && yum clean all
10+
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
1111
LABEL io.k8s.display-name="sriov-network-config-daemon" \
1212
io.k8s.description="This is a daemon that manage and config sriov network devices in Kubernetes cluster"
1313
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‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
2+
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
3+
COPY . .
4+
RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd
5+
6+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
7+
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
8+
LABEL io.k8s.display-name="OpenShift sriov-network-config-daemon" \
9+
io.k8s.description="This is a daemon that manage and config sriov network devices in Openshift cluster" \
10+
io.openshift.tags="openshift,networking,sr-iov" \
11+
maintainer="Multus team <[email protected]>"
12+
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/sriov-network-config-daemon /usr/bin/
13+
COPY bindata /bindata
14+
ENV PLUGINSPATH=/plugins
15+
ENV CLUSTER_TYPE=openshift
16+
CMD ["/usr/bin/sriov-network-config-daemon"]

‎Dockerfile.webhook.rhel7‎

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

‎bindata/manifests/daemon/daemonset.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,22 @@ spec:
130130
containers:
131131
- name: sriov-network-config-daemon
132132
image: {{.Image}}
133-
command:
134-
- sriov-network-config-daemon
133+
imagePullPolicy: Always
134+
# command:
135+
# - dlv
136+
# - --listen=:2345
137+
# - --headless=true
138+
# - --api-version=2
139+
# - --accept-multiclient
140+
# - --log
141+
# - exec
142+
# - /usr/bin/sriov-network-config-daemon
143+
# - --
144+
# - start
135145
securityContext:
136146
privileged: true
147+
command:
148+
- sriov-network-config-daemon
137149
args:
138150
- "start"
139151
{{- if .UsedSystemdMode}}

‎bindata/manifests/operator-webhook/server.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ spec:
6464
containers:
6565
- name: webhook-server
6666
image: {{.SriovNetworkWebhookImage}}
67+
imagePullPolicy: Always
6768
command:
6869
- webhook
6970
args:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ spec:
4242
containers:
4343
- name: sriov-device-plugin
4444
image: {{.SRIOVDevicePluginImage}}
45+
imagePullPolicy: Always
4546
args:
4647
- --log-level=10
4748
- --resource-prefix={{.ResourcePrefix}}

‎bindata/manifests/webhook/server.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ spec:
6767
containers:
6868
- name: webhook-server
6969
image: {{.NetworkResourcesInjectorImage}}
70+
imagePullPolicy: Always
7071
command:
7172
- webhook
7273
args:

0 commit comments

Comments
 (0)