Update naming and tests

codeready-toolchain · Oct 16, 2024 · a27f419 · a27f419
1 parent b608d0e
commit a27f419
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/.../nstemplatetiers/intel-large/cluster.yaml → ...s/nstemplatetiers/intellarge/cluster.yaml b/.../nstemplatetiers/intel-large/cluster.yaml → ...s/nstemplatetiers/intellarge/cluster.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-large-cluster-resources
+  name: intellarge-cluster-resources
 objects:
 - apiVersion: quota.openshift.io/v1
   kind: ClusterResourceQuota

diff --git a/...s/nstemplatetiers/intel-large/ns_dev.yaml → ...es/nstemplatetiers/intellarge/ns_dev.yaml b/...s/nstemplatetiers/intel-large/ns_dev.yaml → ...es/nstemplatetiers/intellarge/ns_dev.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-large-dev
+  name: intellarge-dev
 objects:
 - apiVersion: v1
   kind: Namespace

diff --git a/...atetiers/intel-large/spacerole_admin.yaml → ...latetiers/intellarge/spacerole_admin.yaml b/...atetiers/intel-large/spacerole_admin.yaml → ...latetiers/intellarge/spacerole_admin.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-large-spacerole-admin
+  name: intellarge-spacerole-admin
 objects:
 
 # Rolebindings that grant permissions to the users in their own namespaces

diff --git a/...tes/nstemplatetiers/intel-large/tier.yaml → ...ates/nstemplatetiers/intellarge/tier.yaml b/...tes/nstemplatetiers/intel-large/tier.yaml → ...ates/nstemplatetiers/intellarge/tier.yaml
@@ -1,12 +1,12 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-large-tier
+  name: intellarge-tier
 objects:
 - kind: NSTemplateTier
   apiVersion: toolchain.dev.openshift.com/v1alpha1
   metadata:
-    name: intel-large
+    name: intellarge
     namespace: ${NAMESPACE}
   spec:
     clusterResources:

diff --git a/...nstemplatetiers/intel-medium/cluster.yaml → .../nstemplatetiers/intelmedium/cluster.yaml b/...nstemplatetiers/intel-medium/cluster.yaml → .../nstemplatetiers/intelmedium/cluster.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-medium-cluster-resources
+  name: intelmedium-cluster-resources
 objects:
 - apiVersion: quota.openshift.io/v1
   kind: ClusterResourceQuota

diff --git a/.../nstemplatetiers/intel-medium/ns_dev.yaml → ...s/nstemplatetiers/intelmedium/ns_dev.yaml b/.../nstemplatetiers/intel-medium/ns_dev.yaml → ...s/nstemplatetiers/intelmedium/ns_dev.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-medium-dev
+  name: intelmedium-dev
 objects:
 - apiVersion: v1
   kind: Namespace

diff --git a/...tetiers/intel-medium/spacerole_admin.yaml → ...atetiers/intelmedium/spacerole_admin.yaml b/...tetiers/intel-medium/spacerole_admin.yaml → ...atetiers/intelmedium/spacerole_admin.yaml
@@ -1,7 +1,7 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-medium-spacerole-admin
+  name: intelmedium-spacerole-admin
 objects:
 
 # Rolebindings that grant permissions to the users in their own namespaces

diff --git a/...es/nstemplatetiers/intel-medium/tier.yaml → ...tes/nstemplatetiers/intelmedium/tier.yaml b/...es/nstemplatetiers/intel-medium/tier.yaml → ...tes/nstemplatetiers/intelmedium/tier.yaml
@@ -1,12 +1,12 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: intel-medium-tier
+  name: intelmedium-tier
 objects:
 - kind: NSTemplateTier
   apiVersion: toolchain.dev.openshift.com/v1alpha1
   metadata:
-    name: intel-medium
+    name: intelmedium
     namespace: ${NAMESPACE}
   spec:
     clusterResources:

diff --git a/pkg/templates/nstemplatetiers/nstemplatetier_generator_test.go b/pkg/templates/nstemplatetiers/nstemplatetier_generator_test.go
@@ -32,14 +32,14 @@ var expectedProdTiers = []string{
 	"base1ns6didler",
 	"baselarge",
 	"baseextendedidling",
-	"intel-medium",
-	"intel-large",
+	"intelmedium",
+	"intellarge",
 	"test",
 }
 
 func nsTypes(tier string) []string {
 	switch tier {
-	case "base1ns", "base1nsnoidling", "base1ns6didler", "intel-medium", "intel-large", "test":
+	case "base1ns", "base1nsnoidling", "base1ns6didler", "intelmedium", "intellarge", "test":
 		return []string{"dev"}
 	default:
 		return []string{"dev", "stage"}

diff --git a/pkg/templates/usertiers/usertier_generator_whitebox_test.go b/pkg/templates/usertiers/usertier_generator_whitebox_test.go
@@ -28,6 +28,7 @@ var expectedProdTiers = []string{
 	"deactivate90",
 	"deactivate180",
 	"deactivate365",
+	"intel",
 }
 
 var expectedTestTiers = []string{
@@ -190,6 +191,8 @@ func TestNewUserTier(t *testing.T) {
 					assert.Equal(t, 180, tier.Spec.DeactivationTimeoutDays)
 				case "deactivate365":
 					assert.Equal(t, 365, tier.Spec.DeactivationTimeoutDays)
+				case "intel":
+					assert.Equal(t, 18, tier.Spec.DeactivationTimeoutDays)
 				default:
 					require.Fail(t, "found unexpected tier", "tier '%s' found but not handled", tier.Name)
 				}