starlingx/ansible-playbooks
Code Issues Proposed changes

Merge "Fix k8s 1.19 match selectors for SR-IOV images"

Browse Source
This commit is contained in:
Zuul 2021-09-08 14:39:05 +00:00 committed by Gerrit Code Review
commit 530faba619
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/k8s-v1.19.13/sriov-cni.yaml.j2
View File

@ -13,6 +13,8 @@
# updates of pods with "kubectl apply". # updates of pods with "kubectl apply".
# - The image is set to a stable starlingX version # - The image is set to a stable starlingX version
# - The 'imagePullPolicy: Never' is omitted # - The 'imagePullPolicy: Never' is omitted
# - For k8s 1.19, the matchLabels are the same as the k8s 1.18 labels to
# allow a rolling update to succeed.
# #
# Copyright (c) 2021 Wind River Systems, Inc. # Copyright (c) 2021 Wind River Systems, Inc.
# #
@ -30,7 +32,8 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
name: sriov-cni tier: node
app: sriov-cni
updateStrategy: updateStrategy:
type: RollingUpdate type: RollingUpdate
rollingUpdate: rollingUpdate:

5
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/k8s-v1.19.13/sriov-plugin.yaml.j2
View File

@ -16,6 +16,8 @@
# - The image is set to a stable starlingX version # - The image is set to a stable starlingX version
# - The default configMap is not used. Rather, a hostPath to the config.json file # - The default configMap is not used. Rather, a hostPath to the config.json file
# is used, as resources are populated and based on datanetwork names. # is used, as resources are populated and based on datanetwork names.
# - For k8s 1.19, the matchLabels are the same as the k8s 1.18 labels to
# allow a rolling update to succeed.
# #
# Copyright (c) 2021 Wind River Systems, Inc. # Copyright (c) 2021 Wind River Systems, Inc.
# #
@ -40,7 +42,8 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
name: sriov-device-plugin tier: node
app: sriovdp
updateStrategy: updateStrategy:
type: RollingUpdate type: RollingUpdate
rollingUpdate: rollingUpdate: