Adds support for OCP 4.9 and sets as default

Sean Sundberg · Sean Sundberg · commit dd3d32b333ad · 2022-04-28T22:25:24.000-05:00
- Adds configuration for OCP 4.9 clusters - closes #52 Signed-off-by: Sean Sundberg <seansund@us.ibm.com>
diff --git a/.github/workflows/verify-pr.yaml b/.github/workflows/verify-pr.yaml
@@ -16,8 +16,3 @@ jobs:
 
   verifyMetadata:
     uses: cloud-native-toolkit/action-workflows/.github/workflows/verify-module-metadata.yaml@v1
-
-  securityScan:
-    uses: cloud-native-toolkit/action-workflows/.github/workflows/gitguardian-scan.yaml@v1
-    secrets:
-      GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -17,13 +17,8 @@ jobs:
   verifyMetadata:
     uses: cloud-native-toolkit/action-workflows/.github/workflows/verify-module-metadata.yaml@v1
 
-  securityScan:
-    uses: cloud-native-toolkit/action-workflows/.github/workflows/gitguardian-scan.yaml@v1
-    secrets:
-      GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
-
   release:
-    needs: [verify, verifyMetadata, securityScan]
+    needs: [verify, verifyMetadata]
     uses: cloud-native-toolkit/action-workflows/.github/workflows/release-module.yaml@v1
     secrets:
       TOKEN: ${{ secrets.TOKEN }}
diff --git a/main.tf b/main.tf
@@ -26,6 +26,11 @@ locals {
       type_code = "ocp4"
       version   = "4.8"
     }
+    4.9  = {
+      type      = "openshift"
+      type_code = "ocp4"
+      version   = "4.9"
+    }
   }
   name_prefix           = var.name_prefix != "" ? var.name_prefix : var.resource_group_name
   name_list             = [local.name_prefix, "cluster"]
diff --git a/test/stages/stage1-resource-group.tf b/test/stages/stage1-resource-group.tf
@@ -2,5 +2,5 @@ module "resource_group" {
   source = "github.com/cloud-native-toolkit/terraform-ibm-resource-group.git"
 
   resource_group_name = var.resource_group_name
-  ibmcloud_api_key    = false
+  ibmcloud_api_key    = var.ibmcloud_api_key
 }
diff --git a/test/stages/variables.tf b/test/stages/variables.tf
@@ -69,7 +69,7 @@ variable "worker_count" {
 
 variable "ocp_version" {
   type        = string
-  default     = "4.8"
+  default     = "4.9"
 }
 
 variable "vpc_subnet_label" {
diff --git a/variables.tf b/variables.tf
@@ -36,7 +36,7 @@ variable "flavor" {
 variable "ocp_version" {
   type        = string
   description = "The version of the OpenShift cluster that should be provisioned (format 4.x)"
-  default     = "4.8"
+  default     = "4.9"
 }
 
 variable "exists" {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ locals {`
`26`	`26`	`type_code = "ocp4"`
`27`	`27`	`version = "4.8"`
`28`	`28`	`}`
	`29`	`+ 4.9 = {`
	`30`	`+ type = "openshift"`
	`31`	`+ type_code = "ocp4"`
	`32`	`+ version = "4.9"`
	`33`	`+ }`
`29`	`34`	`}`
`30`	`35`	`name_prefix = var.name_prefix != "" ? var.name_prefix : var.resource_group_name`
`31`	`36`	`name_list = [local.name_prefix, "cluster"]`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ module "resource_group" {`
`2`	`2`	`source = "github.com/cloud-native-toolkit/terraform-ibm-resource-group.git"`
`3`	`3`
`4`	`4`	`resource_group_name = var.resource_group_name`
`5`		`- ibmcloud_api_key = false`
	`5`	`+ ibmcloud_api_key = var.ibmcloud_api_key`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ variable "worker_count" {`
`69`	`69`
`70`	`70`	`variable "ocp_version" {`
`71`	`71`	`type = string`
`72`		`- default = "4.8"`
	`72`	`+ default = "4.9"`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`variable "vpc_subnet_label" {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ variable "flavor" {`
`36`	`36`	`variable "ocp_version" {`
`37`	`37`	`type = string`
`38`	`38`	`description = "The version of the OpenShift cluster that should be provisioned (format 4.x)"`
`39`		`- default = "4.8"`
	`39`	`+ default = "4.9"`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`variable "exists" {`