use $CPE_NAME to find the OS major version

RHEL_VERSION isn't present in scos, but $CPE_NAME is present in /etc/os-release on both distros.
openshift · Sep 20, 2023 · 9f83883 · 9f83883
1 parent 5d189ed
commit 9f83883
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/bindata/network/multus/multus.yaml b/bindata/network/multus/multus.yaml
@@ -39,6 +39,7 @@ data:
     # detect which version we're using in order to copy the proper binaries
     case "${ID}" in
       rhcos|scos)
+        RHEL_VERSION=$(echo "${CPE_NAME}" | cut -f 5 -d :)
         rhelmajor=$(echo $RHEL_VERSION | sed -E 's/([0-9]+)\.{1}[0-9]+(\.[0-9]+)?/\1/')
       ;;
       rhel) rhelmajor=$(echo "${VERSION_ID}" | cut -f 1 -d .)

diff --git a/bindata/network/openshift-sdn/sdn.yaml b/bindata/network/openshift-sdn/sdn.yaml
@@ -113,6 +113,7 @@ spec:
           # detect which version we're using in order to copy the proper binaries
           case "${ID}" in
             rhcos|scos)
+              RHEL_VERSION=$(echo "${CPE_NAME}" | cut -f 5 -d :)
               rhelmajor=$(echo $RHEL_VERSION | sed -E 's/([0-9]+)\.{1}[0-9]+(\.[0-9]+)?/\1/')
             ;;
             rhel) rhelmajor=$(echo "${VERSION_ID}" | cut -f 1 -d .)

diff --git a/bindata/network/ovn-kubernetes/managed/multi-zone-interconnect/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/managed/multi-zone-interconnect/ovnkube-node.yaml
@@ -727,6 +727,7 @@ spec:
           # detect which version we're using in order to copy the proper binaries
           case "${ID}" in
             rhcos|scos)
+              RHEL_VERSION=$(echo "${CPE_NAME}" | cut -f 5 -d :)
               rhelmajor=$(echo $RHEL_VERSION | sed -E 's/([0-9]+)\.{1}[0-9]+(\.[0-9]+)?/\1/')
             ;;
             rhel) rhelmajor=$(echo "${VERSION_ID}" | cut -f 1 -d .)

diff --git a/bindata/network/ovn-kubernetes/managed/single-zone-interconnect/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/managed/single-zone-interconnect/ovnkube-node.yaml
@@ -423,6 +423,7 @@ spec:
           # detect which version we're using in order to copy the proper binaries
           case "${ID}" in
             rhcos|scos)
+              RHEL_VERSION=$(echo "${CPE_NAME}" | cut -f 5 -d :)
               rhelmajor=$(echo $RHEL_VERSION | sed -E 's/([0-9]+)\.{1}[0-9]+(\.[0-9]+)?/\1/')
             ;;
             rhel) rhelmajor=$(echo "${VERSION_ID}" | cut -f 1 -d .)

diff --git a/bindata/network/ovn-kubernetes/self-hosted/multi-zone-interconnect/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/self-hosted/multi-zone-interconnect/ovnkube-node.yaml
@@ -749,6 +749,7 @@ spec:
           # detect which version we're using in order to copy the proper binaries
           case "${ID}" in
             rhcos|scos)
+              RHEL_VERSION=$(echo "${CPE_NAME}" | cut -f 5 -d :)
               rhelmajor=$(echo $RHEL_VERSION | sed -E 's/([0-9]+)\.{1}[0-9]+(\.[0-9]+)?/\1/')
             ;;
             rhel) rhelmajor=$(echo "${VERSION_ID}" | cut -f 1 -d .)

diff --git a/bindata/network/ovn-kubernetes/self-hosted/single-zone-interconnect/ovnkube-node.yaml b/bindata/network/ovn-kubernetes/self-hosted/single-zone-interconnect/ovnkube-node.yaml
@@ -333,6 +333,7 @@ spec:
           # detect which version we're using in order to copy the proper binaries
           case "${ID}" in
             rhcos|scos)
+              RHEL_VERSION=$(echo "${CPE_NAME}" | cut -f 5 -d :)
               rhelmajor=$(echo $RHEL_VERSION | sed -E 's/([0-9]+)\.{1}[0-9]+(\.[0-9]+)?/\1/')
             ;;
             rhel) rhelmajor=$(echo "${VERSION_ID}" | cut -f 1 -d .)