Change daemonset images name to match the built one

Change the antrea.yml daemonsets images name to match the built, or pulled image.
Mellanox · Apr 12, 2021 · 2d5e439 · 2d5e439
1 parent da274ec
commit 2d5e439
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/common/common_functions.sh b/common/common_functions.sh
@@ -486,7 +486,7 @@ function change_k8s_resource {
             name=$(yq r -d "$doc_num" $resource_file metadata.name)
             if [[ "$name" == "$resource_name" ]];then
                 echo "changing $resource_key to $resource_new_value"
-                yq w -i -d "$doc_num" "$resource_file" "$resource_key" "$resource_new_value"
+                yq w -i -d "$doc_num" "$resource_file" "$resource_key" -- "$resource_new_value"
                 changed="true"
                 break
             fi
@@ -502,6 +502,38 @@ function change_k8s_resource {
    return 0
 }
 
+function get_daemonset_container_index_from_container_name {
+    local daemonset_name="$1"
+    local desired_container_name="$2"
+    local file="$3"
+
+    let doc_num=0
+    changed="false"
+    for kind in $(yq r -d "*" $file kind);do
+        if [[ "$kind" == "DaemonSet" ]];then
+            name=$(yq r -d "$doc_num" $file metadata.name)
+            if [[ "$name" == "$daemonset_name" ]];then
+                let container_index=0
+                for container_name in $(yq r -d "$doc_num" $file spec.template.spec.containers[*].name );do
+                    if [[ "$container_name" == "$desired_container_name" ]];then
+                        echo "$container_index"
+                        changed="true"
+                        break
+                    fi
+                    let container_index=$container_index+1
+                done
+            fi
+        fi
+        let doc_num=$doc_num+1
+    done
+
+    if [[ "$changed" == "false" ]];then
+        return 1
+    fi
+
+    return 0
+}
+
 function deploy_sriov_device_plugin {
     build_github_project "sriov-network-device-plugin" \
         "sed -i 's;^TAG=.*;TAG=$SRIOV_NETWORK_DEVICE_PLUGIN_HARBOR_IMAGE;' Makefile && make image"

diff --git a/sriov_antrea/sriov_antrea_ci_start.sh b/sriov_antrea/sriov_antrea_ci_start.sh
@@ -75,10 +75,16 @@ EOF
     if [[ -z "${ANTREA_CNI_PR}${ANTREA_CNI_BRANCH}" ]];then
         change_image_name $ANTREA_CNI_HARBOR_IMAGE antrea/antrea-ubuntu
     fi
-
-    if [[ -z "$(grep hw-offload $WORKSPACE/antrea-cni/build/yamls/antrea.yml)" ]];then
-        sed -i '/start_ovs/a\        - --hw-offload' $WORKSPACE/antrea-cni/build/yamls/antrea.yml
-    fi
+
+    change_image_name antrea/antrea-ubuntu antrea/antrea-ubuntu:ci
+
+    change_k8s_resource "DaemonSet" "antrea-agent" spec.template.spec.containers[*].image "antrea/antrea-ubuntu:ci" "$WORKSPACE/antrea-cni/build/yamls/antrea.yml"
+    change_k8s_resource "Deployment" "antrea-controller" spec.template.spec.containers[*].image "antrea/antrea-ubuntu:ci" "$WORKSPACE/antrea-cni/build/yamls/antrea.yml"
+
+    local antrea_ovs_container_index=$(get_daemonset_container_index_from_container_name "antrea-agent" "antrea-ovs" "$WORKSPACE/antrea-cni/build/yamls/antrea.yml")
+    change_k8s_resource "DaemonSet" "antrea-agent" spec.template.spec.containers["$antrea_ovs_container_index"].command[+] "--hw-offload" "$WORKSPACE/antrea-cni/build/yamls/antrea.yml"
+
+    cp $WORKSPACE/antrea-cni/build/yamls/antrea.yml $ARTIFACTS/antrea.yml
 
     cat > $ARTIFACTS/antrea-crd.yaml <<EOF
 apiVersion: "k8s.cni.cncf.io/v1"
@@ -164,7 +170,7 @@ kubectl create -f $ARTIFACTS/configMap.yaml
 kubectl create -f $(ls -l $WORKSPACE/sriov-network-device-plugin/deployments/*/sriovdp-daemonset.yaml|tail -n1|awk '{print $NF}')
 
 
-kubectl create -f $WORKSPACE/antrea-cni/build/yamls/antrea.yml
+kubectl create -f $ARTIFACTS/antrea.yml
 
 cp $ARTIFACTS/antrea-crd.yaml $(ls -l $WORKSPACE/sriov-network-device-plugin/deployments/*/sriovdp-daemonset.yaml|tail -n1|awk '{print $NF}') $ARTIFACTS/
 screen -S multus_sriovdp -d -m  $WORKSPACE/sriov-network-device-plugin/build/sriovdp -logtostderr 10 2>&1|tee > $LOGDIR/sriovdp.log