use envs

Signed-off-by: NikitaSkrynnik <[email protected]>

Author: NikitaSkrynnik

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
   interdomain:
     runs-on: ubuntu-latest
     env:
-      KUBERNETES_VERSION: ${{ secrets.NSM_KUBERNETES_VERSION }}
+      KUBERNETES_VERSION: ${{ vars.NSM_KUBERNETES_VERSION }}
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
@@ -66,6 +66,7 @@ jobs:
 
       - name: Setup gke
         run: |
+            GKE_K8S_VERSION=$(echo $GKE_K8S_VERSION | cut -c 2-)
             scripts/gke/gke-start.sh
         env:
           GCLOUD_SERVICE_KEY: ${{ secrets.GCLOUD_SERVICE_KEY }}
@@ -74,24 +75,28 @@ jobs:
           GKE_CLUSTER_NAME: gke-${{ github.run_id }}-${{ github.run_number }}
           GKE_CLUSTER_ZONE: us-central1-a
           GKE_CLUSTER_TYPE: n1-standard-2
+          GKE_K8S_VERSION: ${{ vars.NSM_KUBERNETES_VERSION }}
           GKE_CLUSTER_NUM_NODES: 1
           KUBECONFIG: /tmp/config1
           USE_GKE_GCLOUD_AUTH_PLUGIN: true
         working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }}
 
       - name: Setup aws
         run: |
+          AWS_K8S_VERSION_SHORT=$(echo $AWS_K8S_VERSION | cut -d "." -f 1-2 | cut -c 2-)
           scripts/aws/aws-start.sh
         env:
           KUBECONFIG: /tmp/config2
           AWS_REGION: us-east-2
           AWS_CLUSTER_NAME: aws-${{ github.run_id }}-${{ github.run_number }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_K8S_VERSION: ${{ vars.NSM_KUBERNETES_VERSION }}
         working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }}
 
       - name: Setup aks
         run: |
+          AZURE_K8S_VERSION=$(echo $AZURE_K8S_VERSION | cut -c 2-)
           az login --service-principal --username ${AZURE_SERVICE_PRINCIPAL} --password ${AZURE_SERVICE_PRINCIPAL_SECRET} --tenant ${AZURE_TENANT}
           scripts/aks/aks-start.sh ${AZURE_RESOURCE_GROUP} ${AZURE_CLUSTER_NAME} ${AZURE_CREDENTIALS_PATH} ${KUBECONFIG}
         env:
@@ -100,11 +105,15 @@ jobs:
           AZURE_CLUSTER_NAME: aks-${{ github.run_id }}-${{ github.run_number }}
           AZURE_SERVICE_PRINCIPAL: ${{ secrets.AZURE_SERVICE_PRINCIPAL }}
           AZURE_SERVICE_PRINCIPAL_SECRET: ${{ secrets.AZURE_SERVICE_PRINCIPAL_SECRET }}
+          AZURE_K8S_VERSION: ${{ vars.NSM_KUBERNETES_VERSION }}
           AZURE_TENANT: ${{ secrets.AZURE_TENANT }}
         working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }}
 
       - name: Run interdomain testing
         run: |
+          kubectl version --kubeconfig=$KUBECONFIG1
+          kubectl version --kubeconfig=$KUBECONFIG2
+          kubectl version --kubeconfig=$KUBECONFIG3
           go test -count 1 -timeout 2h -race -v ./... -parallel 4
         env:
           KUBECONFIG1: /tmp/config1

scripts/aks/aks-start.sh

@@ -11,6 +11,7 @@ fi
 echo -n "Creating AKS cluster '$AZURE_CLUSTER_NAME'..."
 az aks create \
     --resource-group "$AZURE_RESOURCE_GROUP" \
+    --kubernetes-version "$AZURE_K8S_VERSION" \
     --name "$AZURE_CLUSTER_NAME" \
     --node-count 1 \
     --node-vm-size Standard_B2s \

scripts/aws/aws-start.sh

@@ -6,7 +6,7 @@ export IAM_NAME=ebs-csi-controller-sa
 
 apt-get update && apt-get -y install curl dnsutils
 
-curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.23.6/bin/linux/amd64/kubectl
+curl -LO https://storage.googleapis.com/kubernetes-release/release/$AWS_K8S_VERSION/bin/linux/amd64/kubectl
 chmod +x kubectl
 mkdir -p ~/.local/bin
 mv ./kubectl ~/.local/bin/kubectl
@@ -22,7 +22,7 @@ curl -o aws-iam-authenticator https://s3.us-west-2.amazonaws.com/amazon-eks/1.21
 
 eksctl create cluster  \
       --name "${AWS_CLUSTER_NAME}" \
-      --version 1.27 \
+      --version "${AWS_K8S_VERSION_SHORT}" \
       --nodegroup-name "${AWS_CLUSTER_NAME}-workers" \
       --node-type t3.xlarge \
       --nodes 1

scripts/gke/gke-start.sh

@@ -2,7 +2,7 @@
 
 gcloud components install gke-gcloud-auth-plugin
 gcloud components update
-time gcloud container clusters create "${GKE_CLUSTER_NAME}" --project="${GKE_PROJECT_ID}" --machine-type="${GKE_CLUSTER_TYPE}" --num-nodes=1 --zone="${GKE_CLUSTER_ZONE}" -q
+time gcloud container clusters create "${GKE_CLUSTER_NAME}" --project="${GKE_PROJECT_ID}" --machine-type="${GKE_CLUSTER_TYPE}" --num-nodes=1 --zone="${GKE_CLUSTER_ZONE}" --cluster-version="${GKE_K8S_VERSION}" -q
 echo "Writing config to ${KUBECONFIG}"
 gcloud container clusters get-credentials "${GKE_CLUSTER_NAME}" --project="${GKE_PROJECT_ID}" --zone="${GKE_CLUSTER_ZONE}"
 kubectl create clusterrolebinding cluster-admin-binding  --clusterrole cluster-admin --user "$(gcloud config get-value account)"