From 338e727628c3b1555d8b56a36b82589abf2f5011 Mon Sep 17 00:00:00 2001 From: Carsten Schafer Date: Wed, 29 May 2024 16:47:27 -0400 Subject: [PATCH] Modernizing, switch qa02 to main chart Signed-off-by: Carsten Schafer --- .github/workflows/restart_gw.yml | 5 ++--- .github/workflows/ucentralgw-demo-deployment.yaml | 13 +++++-------- .github/workflows/ucentralgw-dev-deployment.yaml | 10 ++++------ .github/workflows/ucentralgw-qa-deployment.yaml | 7 +++---- .github/workflows/ucentralgw-qa2-deployment.yaml | 8 ++++---- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/.github/workflows/restart_gw.yml b/.github/workflows/restart_gw.yml index 393a5104da..a9ac1eb9c5 100644 --- a/.github/workflows/restart_gw.yml +++ b/.github/workflows/restart_gw.yml @@ -27,10 +27,9 @@ jobs: - name: Fetch kubeconfig run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} - # TODO WIFI-7839 delete when issue is resolved on AWS CLI side - - name: install kubectl + - name: Install kubectl run: | - curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl" + curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl" sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - name: Restart OWGW in defined namespace diff --git a/.github/workflows/ucentralgw-demo-deployment.yaml b/.github/workflows/ucentralgw-demo-deployment.yaml index 405f87410e..6cec969605 100644 --- a/.github/workflows/ucentralgw-demo-deployment.yaml +++ b/.github/workflows/ucentralgw-demo-deployment.yaml @@ -34,7 +34,7 @@ env: { "namespace": "demo", "deploy_method": "git", - "chart_version": "v3.0.0", + "chart_version": "main", "owgw_version": "master", "owsec_version": "main", "owfms_version": "main", @@ -93,7 +93,7 @@ jobs: steps: - name: Checkout repo with Helm values - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: Telecominfraproject/wlan-cloud-ucentral-deploy path: wlan-cloud-ucentral-deploy @@ -109,10 +109,9 @@ jobs: run: | aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} - # TODO WIFI-7839 delete when issue is resolved on AWS CLI side - - name: install kubectl + - name: Install kubectl run: | - curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl" + curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl" sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - name: Deploy OpenWIFI Cloud SDK @@ -143,7 +142,6 @@ jobs: export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }} export OWSUB_VERSION=${{ matrix.owsub_version }} export OWRRM_VERSION=${{ matrix.owrrm_version }} - ./deploy.sh else export DEPLOY_METHOD=git export CHART_VERSION=main @@ -156,8 +154,8 @@ jobs: export OWANALYTICS_VERSION=main export OWSUB_VERSION=main export OWRRM_VERSION=main - ./deploy.sh fi + ./deploy.sh - name: Show resource state on deployment failure if: failure() @@ -182,4 +180,3 @@ jobs: if: failure() run: | helm rollback tip-openwifi --namespace openwifi-${{ matrix.namespace }} --wait --timeout 20m - diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index 58668d009c..fe68f664bb 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -93,7 +93,7 @@ jobs: steps: - name: Checkout repo with Helm values - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: Telecominfraproject/wlan-cloud-ucentral-deploy path: wlan-cloud-ucentral-deploy @@ -109,10 +109,9 @@ jobs: run: | aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} - # TODO WIFI-7839 delete when issue is resolved on AWS CLI side - - name: install kubectl + - name: Install kubectl run: | - curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl" + curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl" sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - name: Deploy OpenWIFI Cloud SDK @@ -143,7 +142,6 @@ jobs: export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }} export OWSUB_VERSION=${{ matrix.owsub_version }} export OWRRM_VERSION=${{ matrix.owrrm_version }} - ./deploy.sh else export DEPLOY_METHOD=git export CHART_VERSION=main @@ -156,8 +154,8 @@ jobs: export OWANALYTICS_VERSION=main export OWSUB_VERSION=main export OWRRM_VERSION=main - ./deploy.sh fi + ./deploy.sh - name: Show resource state on deployment failure if: failure() diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 4f4995797d..01f3cdd535 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -74,7 +74,7 @@ jobs: steps: - name: Checkout repo with Helm values - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: Telecominfraproject/wlan-cloud-ucentral-deploy path: wlan-cloud-ucentral-deploy @@ -90,10 +90,9 @@ jobs: run: | aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} - # TODO WIFI-7839 delete when issue is resolved on AWS CLI side - - name: install kubectl + - name: Install kubectl run: | - curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl" + curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl" sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - name: Deploy OpenWIFI Cloud SDK diff --git a/.github/workflows/ucentralgw-qa2-deployment.yaml b/.github/workflows/ucentralgw-qa2-deployment.yaml index b01b2a6649..829402d443 100644 --- a/.github/workflows/ucentralgw-qa2-deployment.yaml +++ b/.github/workflows/ucentralgw-qa2-deployment.yaml @@ -34,7 +34,7 @@ env: { "namespace": "qa02", "deploy_method": "git", - "chart_version": "v3.0.2-RC1", + "chart_version": "main", "owgw_version": "master", "owsec_version": "main", "owfms_version": "main", @@ -74,7 +74,7 @@ jobs: steps: - name: Checkout repo with Helm values - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: Telecominfraproject/wlan-cloud-ucentral-deploy path: wlan-cloud-ucentral-deploy @@ -90,9 +90,9 @@ jobs: run: | aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} - - name: install kubectl + - name: Install kubectl run: | - curl -s -LO "https://dl.k8s.io/release/v1.27.6/bin/linux/amd64/kubectl" + curl -s -LO "https://dl.k8s.io/release/v1.27.14/bin/linux/amd64/kubectl" sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - name: Deploy OpenWIFI Cloud SDK