Fix release 3.x thick image tag to isolate from 4.0

Due to #900, image tag, ':thick', which is used in 4.0 and 3.x,
gets user confused because thick image is not compatible between
4.0 and 3.x. This fix provides strict version name in deployment
yaml to specify install image tag.
This commit is contained in:
Tomofumi Hayashi 2022-10-12 01:31:15 +09:00
parent 25703fce21
commit e9b87fb05a
2 changed files with 4 additions and 4 deletions

View File

@ -47,7 +47,7 @@ jobs:
context: . context: .
push: true push: true
tags: | tags: |
ghcr.io/${{ github.repository }}:thick-amd64 ghcr.io/${{ github.repository }}:stable-thick-amd64
${{ steps.docker_meta.outputs.tags }}-thick-amd64 ${{ steps.docker_meta.outputs.tags }}-thick-amd64
file: images/Dockerfile.thick file: images/Dockerfile.thick

View File

@ -122,7 +122,7 @@ spec:
serviceAccountName: multus serviceAccountName: multus
containers: containers:
- name: kube-multus - name: kube-multus
image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick image: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.2-thick-amd64
command: [ "/usr/src/multus-cni/bin/multus-daemon" ] command: [ "/usr/src/multus-cni/bin/multus-daemon" ]
args: args:
- "-cni-version=0.3.1" - "-cni-version=0.3.1"
@ -146,7 +146,7 @@ spec:
mountPath: /host/opt/cni/bin mountPath: /host/opt/cni/bin
initContainers: initContainers:
- name: install-multus-binary - name: install-multus-binary
image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick image: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.2-thick-amd64
command: command:
- "cp" - "cp"
- "/usr/src/multus-cni/bin/multus" - "/usr/src/multus-cni/bin/multus"
@ -162,7 +162,7 @@ spec:
mountPath: /host/opt/cni/bin mountPath: /host/opt/cni/bin
mountPropagation: Bidirectional mountPropagation: Bidirectional
- name: generate-kubeconfig - name: generate-kubeconfig
image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick image: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.2-thick-amd64
command: command:
- "/usr/src/multus-cni/bin/generate-kubeconfig" - "/usr/src/multus-cni/bin/generate-kubeconfig"
args: args: