Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix openshift conformance test #128

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions bindata/manifests/daemon/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ spec:
app: sriov-network-config-daemon
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
Expand All @@ -28,6 +30,7 @@ spec:
tolerations:
- operator: Exists
serviceAccountName: sriov-network-config-daemon
priorityClassName: "system-node-critical"
containers:
- name: sriov-network-config-daemon
image: {{.Image}}
Expand All @@ -49,6 +52,10 @@ spec:
fieldPath: metadata.namespace
- name: CLUSTER_TYPE
value: "{{.ClusterType}}"
resources:
requests:
cpu: 100m
memory: 100Mi
volumeMounts:
- name: host
mountPath: /host
Expand Down
7 changes: 7 additions & 0 deletions bindata/manifests/operator-webhook/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ spec:
app: operator-webhook
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
app: operator-webhook
spec:
serviceAccountName: operator-webhook-sa
priorityClassName: "system-cluster-critical"
nodeSelector:
beta.kubernetes.io/os: linux
node-role.kubernetes.io/master:
Expand Down Expand Up @@ -49,6 +52,10 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
resources:
requests:
cpu: 10m
memory: 50Mi
volumeMounts:
- mountPath: /etc/tls
name: tls
Expand Down
11 changes: 11 additions & 0 deletions bindata/manifests/plugins/sriov-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
app: sriov-cni
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
Expand All @@ -28,18 +30,27 @@ spec:
tolerations:
- operator: Exists
serviceAccountName: sriov-cni
priorityClassName: "system-node-critical"
containers:
- name: sriov-cni
image: {{.SRIOVCNIImage}}
securityContext:
privileged: true
resources:
requests:
cpu: 10m
memory: 10Mi
volumeMounts:
- name: cnibin
mountPath: /host/opt/cni/bin
- name: sriov-infiniband-cni
image: {{.SRIOVInfiniBandCNIImage}}
securityContext:
privileged: true
resources:
requests:
cpu: 10m
memory: 10Mi
volumeMounts:
- name: cnibin
mountPath: /host/opt/cni/bin
Expand Down
7 changes: 7 additions & 0 deletions bindata/manifests/plugins/sriov-device-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
app: sriov-device-plugin
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
Expand All @@ -29,6 +31,7 @@ spec:
tolerations:
- operator: Exists
serviceAccountName: sriov-device-plugin
priorityClassName: "system-node-critical"
containers:
- name: sriov-device-plugin
image: {{.SRIOVDevicePluginImage}}
Expand All @@ -43,6 +46,10 @@ spec:
fieldPath: spec.nodeName
securityContext:
privileged: true
resources:
requests:
cpu: 10m
memory: 50Mi
volumeMounts:
- name: devicesock
mountPath: /var/lib/kubelet/
Expand Down
7 changes: 7 additions & 0 deletions bindata/manifests/webhook/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ spec:
app: network-resources-injector
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
Expand All @@ -25,6 +27,7 @@ spec:
openshift.io/component: network
spec:
serviceAccountName: network-resources-injector-sa
priorityClassName: "system-cluster-critical"
nodeSelector:
beta.kubernetes.io/os: linux
node-role.kubernetes.io/master:
Expand Down Expand Up @@ -53,6 +56,10 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
resources:
requests:
cpu: 10m
memory: 50Mi
volumeMounts:
- mountPath: /etc/tls
name: tls
Expand Down
9 changes: 9 additions & 0 deletions deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ spec:
selector:
matchLabels:
name: sriov-network-operator
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
Expand All @@ -19,13 +23,18 @@ spec:
key: node-role.kubernetes.io/master
operator: Exists
serviceAccountName: sriov-network-operator
priorityClassName: "system-node-critical"
containers:
- name: sriov-network-operator
# Replace this with the built image name
image: $SRIOV_NETWORK_OPERATOR_IMAGE
command:
- sriov-network-operator
imagePullPolicy: IfNotPresent
resources:
requests:
cpu: 100m
memory: 100Mi
env:
- name: WATCH_NAMESPACE
valueFrom:
Expand Down
9 changes: 9 additions & 0 deletions deployment/sriov-network-operator/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ spec:
selector:
matchLabels:
name: sriov-network-operator
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 33%
template:
metadata:
labels:
Expand All @@ -23,12 +27,17 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "sriov-network-operator.fullname" . }}
priorityClassName: "system-node-critical"
containers:
- name: {{ include "sriov-network-operator.fullname" . }}
image: {{ .Values.images.operator }}
command:
- sriov-network-operator
imagePullPolicy: IfNotPresent
resources:
requests:
cpu: 100m
memory: 100Mi
env:
- name: WATCH_NAMESPACE
valueFrom:
Expand Down