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 1.33.2 to 1.33.3 #100

Closed
wants to merge 29 commits into from
Closed

Conversation

aman-agrawal
Copy link
Collaborator

@aman-agrawal aman-agrawal commented Jul 1, 2024

Summary :
After rebasing new commits from OSS-1.33.3 on top of OES-1.33.2 commits, old commits hash changed. Therefore older commits are also visible in commit history of this PR.
Changelog : https://spinnaker.io/changelogs/1.33.3-changelog/
Jira : https://devopsmx.atlassian.net/browse/OP-22085 & https://devopsmx.atlassian.net/browse/OP-22345
Testing : compile sucess, UT passed, deployed aman1603/clouddriver:1.33.3 to ns=cvedev in dev-sandbox cluster : basic E2E tests passed, health issue fixed.

mergify bot and others added 29 commits May 15, 2024 14:58
…viders clusterNames of application (spinnaker#6210) (spinnaker#6212)

(cherry picked from commit c9bba66)

Co-authored-by: Christos Arvanitis <[email protected]>
…ocker imageTest docker image (spinnaker#6206) (spinnaker#6227)

* fix(web): replace deprecated spring.profiles in configuration

with spring.config.activate.on-profile to remove these warnings:

2024-05-01 21:29:23.746  WARN 1 --- [           main] o.s.b.c.config.ConfigDataEnvironment     : Property 'spring.profiles' imported from location 'class path resource [clouddriver.yml]' is invalid and should be replaced with 'spring.config.activate.on-profile' [origin: class path resource [clouddriver.yml] - 375:13]
2024-05-01 21:29:23.746  WARN 1 --- [           main] o.s.b.c.config.ConfigDataEnvironment     : Property 'spring.profiles' imported from location 'class path resource [clouddriver.yml]' is invalid and should be replaced with 'spring.config.activate.on-profile' [origin: class path resource [clouddriver.yml] - 363:13]
2024-05-01 21:29:23.746  WARN 1 --- [           main] o.s.b.c.config.ConfigDataEnvironment     : Property 'spring.profiles' imported from location 'class path resource [clouddriver.yml]' is invalid and should be replaced with 'spring.config.activate.on-profile' [origin: class path resource [clouddriver.yml] - 350:13]
2024-05-01 21:29:23.746  WARN 1 --- [           main] o.s.b.c.config.ConfigDataEnvironment     : Property 'spring.profiles' imported from location 'class path resource [clouddriver.yml]' is invalid and should be replaced with 'spring.config.activate.on-profile' [origin: class path resource [clouddriver.yml] - 312:13]

See https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-Config-Data-Migration-Guide#profile-specific-documents.

* feat(docker): add HEALTHCHECK

to facilitate testing container startup

* feat(build): add clouddriver-integration module to exercise the just-built docker image

* feat(gha): run integration test in pr builds

multi-arch with --load doesn't work, so add a separate step using the local platform to
make an image available for testing.

see docker/buildx#59

* feat(gha): run integration test in branch builds

* fix(docker): reduce the chance for false positives in the health check

In case the health check contains more detailed information where one check could report UP but the overall status is down/out of service/etc.

See https://docs.spring.io/spring-boot/docs/2.6.15/reference/html/actuator.html#actuator.endpoints.health for more.

(cherry picked from commit 9ea2224)

Co-authored-by: David Byron <[email protected]>
…ded new tests for postgres and mysql (spinnaker#6221) (spinnaker#6229)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit b00e07f)

Co-authored-by: Kiran Godishala <[email protected]>
…pinnaker#6217) (spinnaker#6231)

* fix(tests): added postgres migration test

* fix(tests): hardcoded the docker image to create initial conditions

* fix(liquibase): add validCheckSum values to fix failing changesets

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit ad1a8ef)

Co-authored-by: Kiran Godishala <[email protected]>
nexus url changed
nexus url changed
@aman-agrawal aman-agrawal requested a review from sanopsmx July 1, 2024 15:54
@aman-agrawal aman-agrawal requested a review from j-sandy July 1, 2024 15:54
@aman-agrawal
Copy link
Collaborator Author

I found some commits missing from commit history but they are part of branch : https://github.com/aman-agrawal/clouddriver/commits/upg/
Looks weird, @j-sandy pls suggest why commit history is not picking all commits for comparison.

@aman-agrawal
Copy link
Collaborator Author

I found some commits missing from commit history but they are part of branch : https://github.com/aman-agrawal/clouddriver/commits/upg/ Looks weird, @j-sandy pls suggest why commit history is not picking all commits for comparison.

I cross-verified & found that every upgrade change is part of this PR. The commits that looks missing because they are subpart of major commit, we have all such major commits with us with all required changes.
Pls go ahead & review the PR.

@aman-agrawal
Copy link
Collaborator Author

Closing #100 as now we are opting cherry-picking rather than rebasing.
New PR : #101

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants