Upgraded from OpenShift 4.9 to 4.10 (#1499)

* Copying https://github.com/kanisterio/kanister/pull/1181/files * Copying https://github.com/kanisterio/kanister/pull/1191/files * Changing PostgreSQLDepConfig4_10's namespace from 4.5 to 4.10 * Updating a comment to add 4.10 to a list of supported versions * Disabling call to check_dependencies for testing purpose * Revert "Disabling call to check_dependencies for testing purpose" This reverts commit 9c1d0ac. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
kanisterio · Jun 27, 2022 · 0b3a3d6 · 0b3a3d6
1 parent 7aec171
commit 0b3a3d6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ DOCKER_CONFIG ?= "$(HOME)/.docker"
 # Mention the vm-driver that should be used to install OpenShift
 vm-driver ?= "kvm"
 # Default OCP version in which the OpenShift apps are going to run
-ocp_version ?= "4.9"
+ocp_version ?= "4.10"
 ###
 ### These variables should not need tweaking.
 ###

diff --git a/build/integration-test.sh b/build/integration-test.sh
@@ -32,7 +32,7 @@ OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4"
 OC_APPS4_5="MysqlDBDepConfig4_5|MongoDBDepConfig4_5|PostgreSQLDepConfig4_5"
 # MongoDB is not provided as external DB template in release 4.9 anymore
 # https://github.com/openshift/origin/commit/4ea9e6c5961eb815c200df933eee30c48a5c9166
-OC_APPS4_9="MysqlDBDepConfig4_9|PostgreSQLDepConfig4_9"
+OC_APPS4_10="MysqlDBDepConfig4_10|PostgreSQLDepConfig4_10"
 
 check_dependencies() {
     # Check if minio is already deployed
@@ -56,7 +56,7 @@ Where app-type is one of [short|all]:
   all: Runs e2e integration tests for all apps
   OR
   You can also provide regex to match apps you want to run.
-  openshift ocp_version=<ocp_version>: Runs e2e integration tests for specific version of OpenShift apps, OCP version can be provided using ocp_version argument. Currently supported versions are 3.11, 4.4 and 4.5.
+  openshift ocp_version=<ocp_version>: Runs e2e integration tests for specific version of OpenShift apps, OCP version can be provided using ocp_version argument. Currently supported versions are 3.11, 4.4, 4.5 and 4.10.
 
 EOM
     exit 1
@@ -87,8 +87,8 @@ case "${1}" in
             "4.5")
                 TEST_APPS=${OC_APPS4_5}
                 ;;
-            "4.9")
-                TEST_APPS=${OC_APPS4_9}
+            "4.10")
+                TEST_APPS=${OC_APPS4_10}
                 ;;
             *)
                 usage

diff --git a/pkg/app/utils.go b/pkg/app/utils.go
@@ -33,8 +33,8 @@ const (
 	TemplateVersionOCP4_4 DBTemplate = "release-4.4"
 	// TemplateVersionOCP4_5 stores version of db template 4.5
 	TemplateVersionOCP4_5 DBTemplate = "release-4.5"
-	// TemplateVersionOCP4_9 stores version of db template 4.9
-	TemplateVersionOCP4_9 DBTemplate = "release-4.9"
+	// TemplateVersionOCP4_10 stores version of db template 4.10
+	TemplateVersionOCP4_10 DBTemplate = "release-4.10"
 )
 
 type storage string

diff --git a/pkg/testing/integration_register.go b/pkg/testing/integration_register.go
@@ -402,45 +402,45 @@ var _ = Suite(&Kafka{
 })
 
 // Mysql Instance that is deployed through DeploymentConfig on OpenShift cluster
-type MysqlDBDepConfig4_9 struct {
+type MysqlDBDepConfig4_10 struct {
 	IntegrationSuite
 }
 
-var _ = Suite(&MysqlDBDepConfig4_9{
+var _ = Suite(&MysqlDBDepConfig4_10{
 	IntegrationSuite{
 		name:      "mysqldc",
-		namespace: "mysqldc4-9-test",
-		app:       app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_9, app.EphemeralStorage, "8.0"),
+		namespace: "mysqldc4-10-test",
+		app:       app.NewMysqlDepConfig("mysqldeploymentconfig", app.TemplateVersionOCP4_10, app.EphemeralStorage, "8.0"),
 		bp:        app.NewBlueprint("mysql-dep-config", "", true),
 		profile:   newSecretProfile(),
 	},
 })
 
 // MongoDB deployed on openshift cluster
-type MongoDBDepConfig4_9 struct {
+type MongoDBDepConfig4_10 struct {
 	IntegrationSuite
 }
 
-var _ = Suite(&MongoDBDepConfig4_9{
+var _ = Suite(&MongoDBDepConfig4_10{
 	IntegrationSuite{
 		name:      "mongodb",
-		namespace: "mongodb4-9-test",
-		app:       app.NewMongoDBDepConfig("mongodeploymentconfig", app.TemplateVersionOCP4_9, app.EphemeralStorage),
+		namespace: "mongodb4-10-test",
+		app:       app.NewMongoDBDepConfig("mongodeploymentconfig", app.TemplateVersionOCP4_10, app.EphemeralStorage),
 		bp:        app.NewBlueprint("mongo-dep-config", "", true),
 		profile:   newSecretProfile(),
 	},
 })
 
 // PostgreSQL deployed on openshift cluster
-type PostgreSQLDepConfig4_9 struct {
+type PostgreSQLDepConfig4_10 struct {
 	IntegrationSuite
 }
 
-var _ = Suite(&PostgreSQLDepConfig4_9{
+var _ = Suite(&PostgreSQLDepConfig4_10{
 	IntegrationSuite{
 		name:      "postgresdepconf",
-		namespace: "postgresdepconf4-5-test",
-		app:       app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_9, app.EphemeralStorage),
+		namespace: "postgresdepconf4-10-test",
+		app:       app.NewPostgreSQLDepConfig("postgresdepconf", app.TemplateVersionOCP4_10, app.EphemeralStorage),
 		bp:        app.NewBlueprint("postgres-dep-config", "", true),
 		profile:   newSecretProfile(),
 	},