Merge branch 'master' into jlamillan/add_user_data_support

Author: matttrach

.github/workflows/release.yaml

@@ -34,26 +34,42 @@ jobs:
 
       - name: sign shasum
         env:
-          GPG_KEY: ${{ env.GPG_KEY }}
-          GPG_KEY_ID: ${{ env.GPG_KEY_ID }}
           GPG_PASSPHRASE: ${{ env.GPG_PASSPHRASE }}
+          GPG_KEY_ID: ${{ env.GPG_KEY_ID }}
+          GPG_KEY: ${{ env.GPG_KEY }}
         run: |
+          cleanup() {
+            # clear history just in case
+            history -c
+          }
+          trap cleanup EXIT TERM
+
+          # sanitize variables
+          GPG_PASSPHRASE="$(echo "${GPG_PASSPHRASE}" | xargs)"
+          GPG_KEY_ID="$(echo "${GPG_KEY_ID}" | xargs)"
+          GPG_KEY="$(echo -n "${GPG_KEY}" | awk '/-----BEGIN PGP PRIVATE KEY BLOCK-----/,/-----END PGP PRIVATE KEY BLOCK-----/')"
+
+          if [ -z "${GPG_PASSPHRASE}" ]; then echo "gpg passphrase empty"; exit 1; fi
+          if [ -z "${GPG_KEY_ID}" ]; then echo "key id empty"; exit 1; fi
+          if [ -z "${GPG_KEY}" ]; then echo "key contents empty"; exit 1; fi
+
           echo "Importing gpg key"
-          echo -n '${{ env.GPG_KEY }}' | gpg --import --batch > /dev/null
+          echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
 
-          echo "signing SHASUM file"
-          VERSION_NO_V="$(echo ${{ github.ref_name }} | tr -d 'v')"
+          echo "Signing SHASUM file"
+          VERSION_NO_V="$(echo "${{ github.ref_name }}" | tr -d 'v')"
           SHASUM_FILE="dist/artifacts/${{ github.ref_name }}/terraform-provider-rancher2_${VERSION_NO_V}_SHA256SUMS"
-          echo '${{ env.GPG_PASSPHRASE }}' | gpg --detach-sig --pinentry-mode loopback --passphrase-fd 0 --local-user "${{ env.GPG_KEY_ID }}" --output "${SHASUM_FILE}.sig" --sign "${SHASUM_FILE}"
 
-          echo "Validating signature..."
+          gpg --detach-sig \
+              --pinentry-mode loopback \
+              --passphrase "${GPG_PASSPHRASE}" \
+              --local-user "${GPG_KEY_ID}" \
+              --output "${SHASUM_FILE}.sig" \
+              --sign "${SHASUM_FILE}" || { echo "Failed to sign checksum."; exit 1; }
 
-          if ! gpg --verify "${SHASUM_FILE}.sig" "${SHASUM_FILE}"; then
-            echo "Signature is valid..."
-          else
-            echo "Signature verification failed!"
-            exit 1
-          fi
+          echo "Validating signature..."
+          gpg --verify "${SHASUM_FILE}.sig" "${SHASUM_FILE}" || { echo "Signature verification failed!"; exit 1; }
+          echo "Signature is valid..."
       - name: GH release
         env:
           GH_TOKEN: ${{ github.token }}

rancher2/config.go

@@ -3,12 +3,10 @@ package rancher2
 import (
 	"context"
 	"fmt"
-	"sort"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/hashicorp/go-version"
 	"github.com/rancher/norman/clientbase"
 	"github.com/rancher/norman/types"
 	clusterClient "github.com/rancher/rancher/pkg/client/generated/cluster/v3"
@@ -148,39 +146,6 @@ func (c *Config) getK8SDefaultVersion() (string, error) {
 	}
 }
 
-func (c *Config) getK8SVersions() ([]string, error) {
-	if len(c.K8SSupportedVersions) > 0 {
-		return c.K8SSupportedVersions, nil
-	}
-
-	if c.Client.Management == nil {
-		_, err := c.ManagementClient()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if ok, _ := c.IsRancherVersionLessThan(rancher2RKEK8sSystemImageVersion); ok {
-		return nil, nil
-	}
-
-	RKEK8sSystemImageCollection, err := c.Client.Management.RkeK8sSystemImage.ListAll(NewListOpts(nil))
-	if err != nil {
-		return nil, fmt.Errorf("[ERROR] Listing RKE K8s System Images: %s", err)
-	}
-	versions := make([]*version.Version, 0, len(RKEK8sSystemImageCollection.Data))
-	for _, RKEK8sSystem := range RKEK8sSystemImageCollection.Data {
-		v, _ := version.NewVersion(RKEK8sSystem.Name)
-		versions = append(versions, v)
-
-	}
-	sort.Sort(sort.Reverse(version.Collection(versions)))
-	for i := range versions {
-		c.K8SSupportedVersions = append(c.K8SSupportedVersions, "v"+versions[i].String())
-	}
-	return c.K8SSupportedVersions, nil
-}
-
 // Fix breaking API change https://github.com/rancher/rancher/pull/23718
 func (c *Config) fixNodeTemplateID(id string) string {
 	if ok, _ := c.IsRancherVersionGreaterThanOrEqual(rancher2NodeTemplateChangeVersion); ok && len(id) > 0 {
@@ -286,10 +251,6 @@ func (c *Config) ManagementClient() (*managementClient.Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	rancher2ClusterRKEK8SVersions, err = c.getK8SVersions()
-	if err != nil {
-		return nil, err
-	}
 
 	return c.Client.Management, nil
 }