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

chore: cherrypick 3 fixes onto the release/v2.14 branch #9705

Closed
wants to merge 3 commits into from

Conversation

plumpy
Copy link
Collaborator

@plumpy plumpy commented Feb 4, 2025

idsulik and others added 3 commits February 4, 2025 11:42
…tallation (GoogleContainerTools#9689)

* fix(helm): Add expand env template for dependsOn and fix concurrent installation

* tests

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

---------

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
…9693)

* fix(helm): Fix helm package installation order

* fix copyright

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

* tests

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

* lint

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

* fixes

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

* fix linters

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

---------

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
Copy link

@code-review-assist code-review-assist bot left a comment

Choose a reason for hiding this comment

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

Hi @plumpy, reviewers, and future viewers!

I'm Gemini, and I'm currently reviewing this pull request. In the meantime, I'm providing a summary for you and other reviewers to quickly get up to speed on the changes and intent.

This pull request, titled "cherrypicks", is a collection of three cherry-picked commits:

  • fix: (helm) Add expand env template for dependsOn, fix concurrent installation (fix(helm): Add expand env template for dependsOn, fix concurrent installation #9689): This commit addresses issues with concurrent Helm installations and environment variable expansion within dependsOn specifications. It appears to involve significant changes to pkg/skaffold/deploy/helm/dependencygraph.go (lines 1-220) and pkg/skaffold/deploy/helm/dependencygraph_test.go (lines 1-320), adding robust dependency graph management and cycle detection. The changes in pkg/skaffold/deploy/helm/helm.go (lines 261-343) reflect the improved dependency handling, ensuring releases are deployed in the correct order, even with concurrency.
  • feat: revert "feat: transform imagePullPolicy when using local cluster (feat: transform imagePullPolicy when using local cluster #9495)" (feat: revert "feat: transform imagePullPolicy when using local cluster (#9495)" #9703): This commit reverts a previous feature that modified the imagePullPolicy when using a local cluster. This involved changes to pkg/skaffold/deploy/kubectl/kubectl.go (lines 241-253) and the removal of pkg/skaffold/kubernetes/manifest/image_pull_policy.go (lines 1-88) and pkg/skaffold/kubernetes/manifest/image_pull_policy_test.go (lines 1-67), suggesting a decision to remove this feature altogether.
  • fix(helm): Fix helm package installation order (fix(helm): Fix helm package installation order #9693): This commit focuses on correcting the installation order of Helm packages. It includes modifications to pkg/skaffold/deploy/helm/helm.go (lines 336-343), specifically handling the expansion of release names using environment templates.

I'll provide a more detailed review shortly. In the meantime, please let me know if you have any questions.

And now, a little poem to lighten the mood:

Code flows like a river,
Cherry-picked commits merge in,
A smoother stream flows.

Copy link

@code-review-assist code-review-assist bot left a comment

Choose a reason for hiding this comment

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

This pull request introduces a significant improvement to the Helm deployer by implementing a dependency graph for releases. This addresses the issue of concurrent installations and ensures releases are deployed in the correct order. The changes also revert a previous feature that transformed imagePullPolicy when using a local cluster, which simplifies the deployment process. The code is well-structured and the tests are comprehensive. I've summarized the Google Go style guide elements referenced in this review below.

Google Go Style Guide Summary:

  • Error Strings: Error strings should not be capitalized or end with punctuation (unless it's a quote or parenthetical phrase).

@plumpy plumpy changed the title cherrypicks chore: cherrypick 3 fixes onto the release/v2.14 branch Feb 4, 2025
@plumpy plumpy closed this Feb 4, 2025
@plumpy plumpy deleted the cherrypicks branch February 4, 2025 17:11
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.

2 participants