update

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 # To make it easier for build and release pipelines to run apt-get,
 # configure apt to not require confirmation (assume the -y argument by default)
@@ -21,8 +21,8 @@ RUN apt-get update \
         netcat \
         ${ADDITIONAL_PACKAGES}
 
-#Install OpenShift Client binary - works for OpenShift v3 & v4
-ENV OPENSHIFT_VERSION ${OPENSHIFT_VERSION:-3.11.272}
+#Install OpenShift Client binary
+ENV OPENSHIFT_VERSION ${OPENSHIFT_VERSION:-4.15.9}
 COPY scripts/download-ocp.sh /tmp/download-ocp.sh
 RUN /bin/bash /tmp/download-ocp.sh ${OPENSHIFT_VERSION} \
 && rm -rf /tmp/download-ocp.sh

manifests/azure-agent-buildconfig.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: azure-agent-buildconfig-template
@@ -14,7 +14,7 @@ parameters:
   value: ""
 - description: OpenShift client binary version to install
   name: OPENSHIFT_VERSION
-  value: "3.11.272"
+  value: "4.15.9"
 - description: Additional ubuntu packages to install
   name: ADDITIONAL_PACKAGES
   value: ""
@@ -62,7 +62,7 @@ objects:
             value: "${ADDITIONAL_PACKAGES}"
         from:
           kind: ImageStreamTag
-          name: ubuntu:18.04
+          name: ubuntu:22.04
       type: Docker
     successfulBuildsHistoryLimit: 5
     triggers:

manifests/azure-agent-configmap.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: azure-agent-configmap-template

manifests/azure-agent-deploymentconfig.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: azure-agent-deploymentconfig-template

manifests/azure-agent-secret.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: azure-agent-secret-template

scripts/download-ocp.sh

@@ -3,37 +3,19 @@
 set -e
 
 OPENSHIFT_VERSION=$1
-OPENSHIFT_3_CLIENT_BINARY_URL=https://mirror.openshift.com/pub/openshift-v3/clients/${OPENSHIFT_VERSION}/linux/oc.tar.gz
-OPENSHIFT_4_CLIENT_BINARY_URL=https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_VERSION}/openshift-client-linux-${OPENSHIFT_VERSION}.tar.gz
+OPENSHIFT_URL="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_VERSION}/openshift-client-linux-${OPENSHIFT_VERSION}.tar.gz"
+OPENSHIFT_BINARY_FILE="openshift-client-linux-${OPENSHIFT_VERSION}.tar.gz"
 
 
 echo "OPENSHIFT_VERSION=${OPENSHIFT_VERSION}"
-echo "OPENSHIFT_3_CLIENT_BINARY_URL=${OPENSHIFT_3_CLIENT_BINARY_URL}"
-echo "OPENSHIFT_4_CLIENT_BINARY_URL=${OPENSHIFT_4_CLIENT_BINARY_URL}"
-
-# Determine Openshift Major Verison
-if [[ $OPENSHIFT_VERSION == 3* ]]
-then
-    OPENSHIFT_MAJOR_VERSION=3
-    OPENSHIFT_BINARY_FILE=oc.tar.gz
-elif [[ $OPENSHIFT_VERSION == 4* ]]
-then
-    OPENSHIFT_MAJOR_VERSION=4
-    OPENSHIFT_BINARY_FILE="openshift-client-linux-${OPENSHIFT_VERSION}.tar.gz"
-else
-    echo "Not a valid OpenShift major version  OPENSHIFT_VERSION=$OPENSHIFT_VERSION"; exit 1
-fi
-
-echo "OPENSHIFT_MAJOR_VERSION=${OPENSHIFT_MAJOR_VERSION}"
 echo "OPENSHIFT_BINARY_FILE=${OPENSHIFT_BINARY_FILE}"
+echo "OPENSHIFT_URL=${OPENSHIFT_URL}"
 
 #Download OpenShift client binary
-OPENSHIFT_URL=OPENSHIFT_${OPENSHIFT_MAJOR_VERSION}_CLIENT_BINARY_URL
-echo "OPENSHIFT_URL=${!OPENSHIFT_URL}"
-curl --silent --show-error --output /tmp/${OPENSHIFT_BINARY_FILE} ${!OPENSHIFT_URL}
+curl --silent --show-error --output "/tmp/${OPENSHIFT_BINARY_FILE}" "${OPENSHIFT_URL}"
 
 #Install OpenShift Client Binary
 mkdir -p /usr/local/bin 
-tar xzf /tmp/oc.tar.gz -C /usr/local/bin
-chmod +x /usr/local/bin/oc
-rm -rf /tmp/${OPENSHIFT_BINARY_FILE}
+tar xzf "/tmp/${OPENSHIFT_BINARY_FILE}" oc kubectl -C /usr/local/bin
+chmod +x /usr/local/bin/oc /usr/local/bin/kubectl
+rm -rf "/tmp/${OPENSHIFT_BINARY_FILE}"