From 7c73bc6f95fba3abb311cbd0288048c23688abf2 Mon Sep 17 00:00:00 2001
From: ccremer <github.account@chrigel.net>
Date: Tue, 9 Aug 2022 18:37:56 +0200
Subject: [PATCH] Fix deployment workflows after API URL change

---
 .github/workflows/deploy-master.yaml   | 2 +-
 .github/workflows/deploy-preview.yaml  | 6 ++----
 .github/workflows/deploy-prod.yaml     | 4 +---
 .github/workflows/destroy-preview.yaml | 4 +---
 .github/workflows/lint.yaml            | 2 +-
 .github/workflows/release.yaml         | 2 +-
 .github/workflows/test.yaml            | 2 +-
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deploy-master.yaml b/.github/workflows/deploy-master.yaml
index fb1e827..4519f05 100644
--- a/.github/workflows/deploy-master.yaml
+++ b/.github/workflows/deploy-master.yaml
@@ -10,7 +10,7 @@ on:
     - .github/workflows/deploy-*.yaml
 
 env:
-  OPENSHIFT_API: https://api.c-appuio-cloudscale-lpg-2.appuio.cloud:6443
+  OPENSHIFT_API: https://api.cloudscale-lpg-2.appuio.cloud:6443
   HELM_RELEASE_NAME: odootools
   NAMESPACE: vshn-odoo-prod
 
diff --git a/.github/workflows/deploy-preview.yaml b/.github/workflows/deploy-preview.yaml
index 3157e4b..3da0a7e 100644
--- a/.github/workflows/deploy-preview.yaml
+++ b/.github/workflows/deploy-preview.yaml
@@ -5,7 +5,7 @@ on:
 
 env:
   ENVIRONMENT: test
-  OPENSHIFT_API: https://api.c-appuio-cloudscale-lpg-2.appuio.cloud:6443
+  OPENSHIFT_API: https://api.cloudscale-lpg-2.appuio.cloud:6443
   HELM_RELEASE_NAME: odootools-pr-${{ github.event.number }}
   REGISTRY_URL: registry.cloudscale-lpg-2.appuio.cloud
   IMG_TAG: pr-${{ github.event.number }}
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Determine Go version from go.mod
-      run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
+      run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
 
     - uses: actions/setup-go@v3
       with:
@@ -51,8 +51,6 @@ jobs:
         openshift_server_url: ${{ env.OPENSHIFT_API }}
         openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
         namespace: ${{ env.NAMESPACE }}
-        # We don't have a LE cert yet
-        insecure_skip_tls_verify: true
 
     - name: Docker login
       uses: docker/login-action@v2
diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml
index 4e639fd..ba7ad01 100644
--- a/.github/workflows/deploy-prod.yaml
+++ b/.github/workflows/deploy-prod.yaml
@@ -6,7 +6,7 @@ on:
     - "*"
 
 env:
-  OPENSHIFT_API: https://api.c-appuio-cloudscale-lpg-2.appuio.cloud:6443
+  OPENSHIFT_API: https://api.cloudscale-lpg-2.appuio.cloud:6443
   HELM_RELEASE_NAME: odootools
 
 jobs:
@@ -34,8 +34,6 @@ jobs:
         openshift_server_url: ${{ env.OPENSHIFT_API }}
         openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
         namespace: vshn-odoo-prod
-        # We don't have a LE cert yet
-        insecure_skip_tls_verify: true
 
     - name: Deploy app
       run: helmfile -f envs/helmfile.yaml -e prod apply
diff --git a/.github/workflows/destroy-preview.yaml b/.github/workflows/destroy-preview.yaml
index 578d8a5..4ed2b96 100644
--- a/.github/workflows/destroy-preview.yaml
+++ b/.github/workflows/destroy-preview.yaml
@@ -7,7 +7,7 @@ on:
 
 env:
   ENVIRONMENT: test
-  OPENSHIFT_API: https://api.c-appuio-cloudscale-lpg-2.appuio.cloud:6443
+  OPENSHIFT_API: https://api.cloudscale-lpg-2.appuio.cloud:6443
   HELM_RELEASE_NAME: odootools-pr-${{ github.event.number }}
   IMG_TAG: pr-${{ github.event.number }}
   NAMESPACE: vshn-odoo-test
@@ -37,8 +37,6 @@ jobs:
         openshift_server_url: ${{ env.OPENSHIFT_API }}
         openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
         namespace: ${{ env.NAMESPACE }}
-        # We don't have a LE cert yet
-        insecure_skip_tls_verify: true
 
     - name: Uninstall app
       run: make preview.destroy
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 23fb0f4..65d48df 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Determine Go version from go.mod
-      run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
+      run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
 
     - uses: actions/setup-go@v3
       with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 19dd73a..00776e0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -14,7 +14,7 @@ jobs:
         fetch-depth: 0
 
     - name: Determine Go version from go.mod
-      run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
+      run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
 
     - uses: actions/setup-go@v3
       with:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5469b32..a7cd089 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Determine Go version from go.mod
-      run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
+      run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
 
     - uses: actions/setup-go@v3
       with: