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.

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

Conversation

eric-nadeau
Copy link
Contributor

@eric-nadeau eric-nadeau commented Jun 21, 2022

Change Overview

  1. Bumped up various instances of 4.9/4_9/4-9 to 4.10/4_10/4-10
    1. In these files:
      1. Makefile
      2. build/integration-test.sh
      3. pkg/app/utils.go
      4. pkg/testing/integration_register.go
    2. Based on these PRs to upgrade from 4.7 to 4.9:
      1. https://github.com/kanisterio/kanister/pull/1181/files
      2. https://github.com/kanisterio/kanister/pull/1191/files
    3. One exception was PostgreSQL's namespace
      1. Changed from postgresdepconf4-5-test to postgresdepconf4-10-test
      2. Seems we missed it in previous upgrades

Pull request type

Please check the type of change your PR introduces:

  • 🚧 Work in Progress
  • 🌈 Refactoring (no functional changes, no api changes)
  • 🐹 Trivial/Minor
  • 🐛 Bugfix
  • 🌻 Feature
  • 🗺️ Documentation
  • 🤖 Test

Issues

Test Plan

  • 💪 Manual
  • ⚡ Unit test
  • 💚 E2E
1. Disabled minio check

   1. Ensured there were no local changes

      veeam:~/src/kanister$ git status
      On branch 1474_SupportOpenShift4.10
      Your branch is up to date with 'origin/1474_SupportOpenShift4.10'.
      
      nothing to commit, working tree clean

   2. Patched integration-test.sh

      veeam:~/src/kanister$ sed -i '' -e '/check_dependencies$/d' build/integration-test.sh

   3. Inspected the changes
      
      veeam:~/src/kanister$ git diff
      diff --git a/build/integration-test.sh b/build/integration-test.sh
      index e717318d..10827f81 100755
      --- a/build/integration-test.sh
      +++ b/build/integration-test.sh
      @@ -100,7 +100,6 @@ case "${1}" in
	       ;;
       esac

      -check_dependencies
       echo "Running integration tests:"
       pushd ${INTEGRATION_TEST_DIR}
       go test -v ${TEST_OPTIONS} -check.f "${TEST_APPS}" -installsuffix "static" . -check.v

2. Ran openshift-test
   
   1. Deployed an OpenShift 4.10 cluster
   2. Pointed ~/.kube/config to it
   3. Verified the cluster is running 4.10

      veeam:~/src/kanister$ oc version | grep Server
      Server Version: 4.10.17

   4. Ensured my environment variables were set

      veeam:~/src/kanister$ printenv | awk -F= '/AWS/{print$1}'
      AWS_ACCESS_KEY_ID
      AWS_SECRET_ACCESS_KEY
      AWS_REGION

   5. Ran openshift tests

      veeam:~/src/kanister$ /usr/bin/time -p make openshift-test
      Running integration tests:
      ~/src/kanister/pkg/testing ~/src/kanister
      === RUN   Test

      ****************************************
      *** truncated 114 lines of JSON logs ***
      ****************************************

      OK: 2 passed
      --- PASS: Test (109.93s)
      PASS
      ok  	github.com/kanisterio/kanister/pkg/testing	110.509s
      ~/src/kanister
      real 115.21
      user 6.37
      sys 4.25
      veeam:~/src/kanister$ echo $?
      0

3. Ran integration-test

   1. Deployed a plain cluster in AWS' EKS

   2. Pointed ~/.kube/config to it
      
   3. Ensured my environment variables were set

      veeam:~/src/kanister$ printenv | awk -F= '/AWS/{print$1}'
      AWS_ACCESS_KEY_ID
      AWS_SECRET_ACCESS_KEY
      AWS_REGION

   4. Called the make target to run integration tests

      veeam:~/src/kanister$ /usr/bin/time -p make integration-test DOCKER_BUILD=false
      Running integration tests:
      ~/src/kanister/pkg/testing ~/src/kanister
      === RUN   Test

      ****************************************
      *** truncated 355 lines of JSON logs ***
      ****************************************

      OK: 6 passed
      --- PASS: Test (231.88s)
      PASS
      ok  	github.com/kanisterio/kanister/pkg/testing	232.463s
      ~/src/kanister
      real 236.56
      user 18.67
      sys 7.75
      veeam:~/src/kanister$ echo $?
      0

@github-actions
Copy link
Contributor

Thanks for submitting this pull request 🎉. The team will review it soon and get back to you.

If you haven't already, please take a moment to review our project contributing guideline and Code of Conduct document.

@eric-nadeau eric-nadeau marked this pull request as ready for review June 21, 2022 18:20
Copy link
Contributor

@pavannd1 pavannd1 left a comment

Choose a reason for hiding this comment

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

LGTM

Was thinking about removing older versions. We can address that later 👍🏼

@@ -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

@@ -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

@mergify mergify bot merged commit 0b3a3d6 into master Jun 27, 2022
@mergify mergify bot deleted the 1474_SupportOpenShift4.10 branch June 27, 2022 15:42
@ihcsim ihcsim mentioned this pull request Jul 20, 2022
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants