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

Backport of added imagePullPolicy for images in values.yaml into release/1.2.x #2364

Conversation

hc-github-team-consul-core

Backport

This PR is auto-generated from #2310 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@aahel
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR:

  • Added support for a global imagePullPolicy that would be used in all images which are configurable using the helm template.

How I've tested this PR:
rendered helm template and test by passing different values of imagePullPolicy
How I expect reviewers to test this PR:
eg:-
cd charts/consul
helm template
-s templates/api-gateway-controller-deployment.yaml
--set 'apiGateway.enabled=true'
--set 'global.imagePullPolicy="Always"'
--set 'apiGateway.image=bar'
--set 'global.enableConsulNamespaces=true'
. | tee /dev/stderr

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

curtbushko and others added 30 commits November 17, 2022 10:39
- Went through old PRs to make sure they were in the list.
- Removed beta sections.
On a non-default partition with ACLs and peering and partitions are all enabled. add a condition to the partition_prefix rule to avoid this error:
```
Failure: creating mesh-gateway-policy policy: err="Unexpected response code: 500 (rpc error making call: Invalid policy rules: partitioned policy cannot use partition_prefix rules)"
```
* Update readme for 1.0 GA
- use ubuntu based image for static-client in acceptance tests because alpine images are known to be flakey with DNS on kubernetes: https://stackoverflow.com/questions/65181012/does-alpine-have-known-dns-issue-within-kubernetes
- Fix ACL permissions for the connect injector to make wan federations tests pass. Previously, injector only needed the global auth method when namespaces are enabled. Now that we've joined it with the controller, it needs global auth method in the secondary all the time.
- Fix debug info from envoy (previously we were assuming there's consul-sidecar). This change also adds debugging info to all pods that use envoy.

Co-authored-by: Nitya Dhanushkodi <nitya@hashicorp.com>
Co-authored-by: Ashwin Venkatesh <ashwin.what@gmail.com>
Add fix for api-gateway when using system-wide trusted CAs for external servers
…aml (#1740)

* remove controller webhook cert roles from vault test and the values.yaml
* add discover binary to control-plane image
#1756)

* Add support for setting the namespace that the CNI plugin is installed into
* Fix name of autoencrypt cert
* Update BATS
* Update CHANGELOG
* Remove HOST_IP
* Don't mount consul-ca-cert when using system roots and external servers
* Remove timeout and partition flags'
* Don't mount consul-ca-cert when using system roots and external servers on main container
Mount certs when using clients even with external servers
* Remove controller from preset values file in CLI
* Update to consuls latest versions
* go mod tidy
* Add global.extraLabels values.yaml setting
This setting lets you apply a set of labels to all pods created by the
consul-k8s helm chart.
* Also apply global extra labels to deployments/daemonsets/statefulsets/jobs
* Add global extraLabels to sync catalog deployment
…o release/1.2.x (#2319)

* backport of commit 0db1259

* backport of commit d4cdb45

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
…1.2.x (#2322)

* backport of commit 3f1c9e0

* backport of commit c56ac76

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
…ease/1.2.x (#2323)

* backport of commit 38b08c5

* backport of commit 02474a7

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
…ith latest version of kind and k8s 1.27 into release/1.2.x (#2320)

* backport of commit 41dc1c9

* backport of commit 87a39c1

* backport of commit df46c2e

---------

Co-authored-by: Michael Wilkerson <mwilkerson@hashicorp.com>
…on GatewayClassConfig are obeyed into release/1.2.x (#2324)

* backport of commit 2fc5343

* backport of commit d83f0fd

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
…2329)

* backport of commit 613c0cc

* backport of commit ac7d0db

* backport of commit c04bd0f

* backport of commit 0fe80e7

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
…nto release/1.2.x (#2328)

* backport of commit 545a1c2

* backport of commit 0a728a5

* backport of commit e361613

* backport of commit 1ac147c

* backport of commit a01e9e2

* backport of commit 504e2fc

---------

Co-authored-by: Thomas Eckert <teckert@hashicorp.com>
Co-authored-by: Michael Wilkerson <mwilkerson@hashicorp.com>
Co-authored-by: skpratt <sarah.pratt@hashicorp.com>
Co-authored-by: Michael Wilkerson <mwilkerson@hashicorp.com>
Co-authored-by: Alvin Huang <17609145+alvin-huang@users.noreply.github.com>
* update changelog files

* update for release 1.2-rc1

* fix RateLimitIPConfig tests

* pinning version temporarily for testing
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/aahel/added-imagPullPolicy/literally-helped-hippo branch from 3aa4569 to 0779d1d Compare June 13, 2023 16:07
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/aahel/added-imagPullPolicy/literally-helped-hippo branch from 0779d1d to 3aa4569 Compare June 13, 2023 16:07
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 13, 2023

CLA assistant check
All committers have signed the CLA.

@aahel aahel marked this pull request as ready for review June 13, 2023 19:05
@david-yu
Copy link
Contributor

@aahel Looks like this requires a manual git cherry-pick from the original git merge commit.

@aahel aahel self-requested a review June 14, 2023 04:25
@aahel
Copy link
Contributor

aahel commented Jun 14, 2023

@thisisnotashwin
license/cla is not passing bcoz temp didn't sign cla. The commit by temp got automatically added when backport pr was created. Any idea how to get around this ?

@thisisnotashwin
Copy link
Contributor

@aahel in this case, you copuld close this PR, and create another one yourself. you can still use the same PR i think but use --reset-author to fixup the commit and remove temp as an author of the PR

* added imagePullPolicy for images in values.yaml

* fix: renamed pullPolicy key according to image

* fixed dafault always in tmpl

* changed structure of image in yaml

* revert changes

* added global imagePullPolicy

* fixed typo

* added changelog file
@aahel aahel closed this Jun 14, 2023
@aahel aahel force-pushed the backport/aahel/added-imagPullPolicy/literally-helped-hippo branch from 0b71c5c to c370f60 Compare June 14, 2023 15:42
@aahel aahel deleted the backport/aahel/added-imagPullPolicy/literally-helped-hippo branch June 14, 2023 15:43
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.