Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded from OpenShift 4.9 to 4.10 #1499

Merged
merged 7 commits into from
Jun 27, 2022
Merged

Upgraded from OpenShift 4.9 to 4.10 #1499

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d289f24
Copying https://github.com/kanisterio/kanister/pull/1181/files
eric-nadeau Jun 13, 2022
406e2e3
Copying https://github.com/kanisterio/kanister/pull/1191/files
eric-nadeau Jun 13, 2022
b0fe289
Changing PostgreSQLDepConfig4_10's namespace from 4.5 to 4.10
eric-nadeau Jun 13, 2022
0d5bdda
Updating a comment to add 4.10 to a list of supported versions
eric-nadeau Jun 14, 2022
9c1d0ac
Disabling call to check_dependencies for testing purpose
eric-nadeau Jun 17, 2022
8a99ed5
Revert "Disabling call to check_dependencies for testing purpose"
eric-nadeau Jun 21, 2022
46db929
Merge branch 'master' into 1474_SupportOpenShift4.10
mergify[bot] Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
###
Expand Down
8 changes: 4 additions & 4 deletions build/integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4"
OC_APPS4_5="MysqlDBDepConfig4_5|MongoDBDepConfig4_5|PostgreSQLDepConfig4_5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just remove older versions? I'm confident that we don't support 3.11 anymore but we can reduce the tests to just the latest version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the way the code is written it looked like we wanted to support some specific legacy versions in addition to the latest. This ticket was opened to track this idea: #1512

# 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
Expand All @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above


EOM
exit 1
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/app/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions pkg/testing/integration_register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
Expand Down