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

feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions (backport #1020) #1028

Merged
merged 2 commits into from
Oct 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2023

This is an automatic backport of pull request #1020 done by Mergify.
Cherry-pick of 4a12958 has failed:

On branch mergify/bp/release-1.28.x/pr-1020
Your branch is up to date with 'origin/release-1.28.x'.

You are currently cherry-picking commit 4a12958.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rosco-manifests/src/main/java/com/netflix/spinnaker/rosco/manifests/helm/HelmBakeManifestRequest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosco-manifests/src/main/java/com/netflix/spinnaker/rosco/manifests/helm/HelmTemplateUtils.java
	both modified:   rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/helm/HelmTemplateUtilsTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ails of the APIs versions (#1020)

* security(feature): Change codeql to scan daily instead of weekly

* feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions

- These input fields will not be pre-populated with versions of the target cluster available in the environment.

- They will become part of the bake result.

- Added API_VERSIONS_ENABLED env variable flag

* feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions

- These input fields will not be pre-populated with versions of the target cluster available in the environment.

- They will become part of the bake result.

- Added API_VERSIONS_ENABLED env variable flag

* feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions

- These input fields will not be pre-populated with versions of the target cluster available in the environment.

- They will become part of the bake result.

- Added API_VERSIONS_ENABLED env variable flag

---------

Co-authored-by: Jason McIntosh <jason.mcintosh@armory.io>
(cherry picked from commit 4a12958)

# Conflicts:
#	rosco-manifests/src/main/java/com/netflix/spinnaker/rosco/manifests/helm/HelmTemplateUtils.java
#	rosco-manifests/src/test/java/com/netflix/spinnaker/rosco/manifests/helm/HelmTemplateUtilsTest.java
@spinnakerbot
Copy link
Contributor

Features cannot be merged into release branches. The following commits are not tagged as one of "fix, chore, docs, perf, test":

Read more about commit conventions and patch releases here.

@dogonthehorizon dogonthehorizon merged commit e8bf6c5 into release-1.28.x Oct 18, 2023
2 checks passed
@mergify mergify bot deleted the mergify/bp/release-1.28.x/pr-1020 branch October 18, 2023 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants