fix: Clean up test suite (#1587)

Signed-off-by: matttrach <matt.trachier@suse.com>

Author: matttrach

.github/workflows/pull_request.yaml

@@ -99,16 +99,18 @@ jobs:
           # This format enables automatic generation of changelogs and versioning
           filter() {
             COMMIT="$1"
-            ouput="$(echo "$COMMIT" | grep -e '^fix: ' -e '^feature: ' -e '^feat: ' -e 'refactor!: ' -e 'feature!: ' -e 'feat!: ' -e '^chore(main): ')"
+            output="$(echo "$COMMIT" | grep -v -e '^fix: ' -e '^feature: ' -e '^feat: ' -e '^refactor!: ' -e '^feature!: ' -e '^feat!: ' -e '^chore(main): ' -e '^Merge branch ')"
             echo "$output"
           }
           prefix_check() {
             message="$1"
             if [ "" != "$(filter "$message")" ]; then
-              echo "...Commit message does not start with the required prefix.
-              Please use one of the following prefixes: "fix:", "feature:", "feat:", "refactor!:", "feature!:", or "feat!:".
-              This enables release-please to automatically determine the type of release (major, minor, patch) based on the commit message.
-              $message"
+              cat <<EOF
+          ...Commit message does not start with the required prefix.
+          Please use one of the following prefixes: "fix:", "feature:", "feat:", "refactor!:", "feature!:", or "feat!:".
+          This enables release-please to automatically determine the type of release (major, minor, patch) based on the commit message.
+          $message
+          EOF
               exit 1
             else
               echo "...Commit message starts with the required prefix."
@@ -125,16 +127,17 @@ jobs:
           }
           length_check() {
             message="$1"
-            if [ "$(wc -m <<<"$message")" -gt 50 ]; then
-              echo "...Commit message subject line should be less than 50 characters, found $(wc -m "$message")."
+            length="$(wc -m <<<"$message")"
+            if [ $length -gt 50 ]; then
+              echo "...Commit message subject line should be less than 50 characters, found $length."
               exit 1
             else
               echo "...Commit message subject line is less than 50 characters."
             fi
           }
           spell_check() {
             message="$1"
-            WORDS="$(aspell list <<<"$message")"
+            WORDS="$(aspell list --dont-validate-words <<<"$message")"
             if [ "" != "$WORDS" ]; then
               echo "...Commit message contains spelling errors on: ^$WORDS\$"
               echo "...Also try updating the PR title."

aspell_custom.txt

@@ -0,0 +1,15 @@
+rancher
+rke
+rke2
+oci
+oke
+aws
+azure
+aks
+eks
+kubernetes
+kubeconfig
+config
+git
+variablize
+terraform

examples/deploy_rke2/README.md renamed to examples/deploy_downstream_basic/README.md

@@ -23,29 +23,30 @@ provider "rancher2" {
 }
 
 locals {
-  identifier            = var.identifier
-  example               = "downstream"
-  project_name          = "tf-${substr(md5(join("-", [local.example, local.identifier])), 0, 5)}"
-  username              = local.project_name
-  domain                = local.project_name
-  zone                  = var.zone
-  key_name              = var.key_name
-  key                   = var.key
-  owner                 = var.owner
-  rke2_version          = var.rke2_version
-  local_file_path       = var.file_path
-  runner_ip             = chomp(data.http.myip.response_body) # "runner" is the server running Terraform
-  rancher_version       = var.rancher_version
-  cert_manager_version  = "1.16.3" #"1.13.1"
-  os                    = "sle-micro-61"
-  aws_access_key_id     = var.aws_access_key_id
-  aws_secret_access_key = var.aws_secret_access_key
-  aws_region            = var.aws_region
-  aws_session_token     = var.aws_session_token
-  aws_instance_type     = "m5.large"
-  node_count            = 3
-  email                 = (var.email != "" ? var.email : "${local.identifier}@${local.zone}")
-  acme_server_url       = "https://acme-v02.api.letsencrypt.org"
+  identifier              = var.identifier
+  example                 = "downstream"
+  project_name            = "tf-${substr(md5(join("-", [local.example, local.identifier])), 0, 5)}"
+  username                = local.project_name
+  domain                  = local.project_name
+  zone                    = var.zone
+  key_name                = var.key_name
+  key                     = var.key
+  owner                   = var.owner
+  rke2_version            = var.rke2_version
+  local_file_path         = var.file_path
+  runner_ip               = chomp(data.http.myip.response_body) # "runner" is the server running Terraform
+  rancher_version         = var.rancher_version
+  cert_manager_version    = "1.16.3" #"1.13.1"
+  os                      = "sle-micro-61"
+  aws_access_key_id       = var.aws_access_key_id
+  aws_secret_access_key   = var.aws_secret_access_key
+  aws_region              = var.aws_region
+  aws_session_token       = var.aws_session_token
+  aws_instance_type       = "m5.large"
+  node_count              = 3
+  email                   = (var.email != "" ? var.email : "${local.identifier}@${local.zone}")
+  acme_server_url         = "https://acme-v02.api.letsencrypt.org"
+  downstream_cluster_name = "${local.project_name}-aio"
 }
 
 data "http" "myip" {
@@ -54,7 +55,7 @@ data "http" "myip" {
 
 module "rancher" {
   source  = "rancher/aws/rancher2"
-  version = "1.2.2"
+  version = "2.0.1"
   # project
   identifier                   = local.identifier
   owner                        = local.owner
@@ -111,7 +112,7 @@ module "downstream" {
   ]
   source = "./modules/downstream"
   # general
-  name       = "${local.project_name}-aio"
+  name       = local.downstream_cluster_name
   identifier = local.identifier
   owner      = local.owner
   # aws access
@@ -143,3 +144,12 @@ module "downstream" {
   # rke2 info
   rke2_version = local.rke2_version
 }
+
+data "rancher2_cluster_v2" "downstream" {
+  depends_on = [
+    module.rancher,
+    module.rke2_image,
+    module.downstream,
+  ]
+  name = local.downstream_cluster_name
+}

examples/deploy_rke2/main.tf renamed to examples/deploy_downstream_basic/main.tf

@@ -0,0 +1,3 @@
+output "cluster_id" {
+  value = rancher2_cluster_v2.rke2_cluster.cluster_v1_id
+}

examples/deploy_rke2/modules/downstream/addKeyToAmazonConfig.sh renamed to examples/deploy_downstream_basic/modules/downstream/addKeyToAmazonConfig.sh

@@ -8,15 +8,11 @@ output "kubeconfig" {
 output "address" {
   value = module.rancher.address
 }
-# output "admin_token" {
-#   value     = module.rancher.admin_token
-#   sensitive = true
-# }
 output "admin_password" {
   value     = module.rancher.admin_password
   sensitive = true
 }
-
-# output "rke2_cluster_subnet" {
-#   value = module.rke2_cluster_access.subnets[keys(module.rke2_cluster_access.subnets)[0]]
-# }
+output "downstream_kubeconfig" {
+  value     = data.rancher2_cluster_v2.downstream.kube_config
+  sensitive = true
+}