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 NET-581 - Added vault namespace in helm into release/1.1.x #2926

Conversation

hc-github-team-consul-core

Backport

This PR is auto-generated from #2841 to be assessed for backporting due to the inclusion of the label backport/1.1.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:
@absolutelightning
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: unable to process merge commit: "c7342840f1e1f0ca6ec613332ae3dfdd12be19cc", automatic backport requires rebase workflow

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


Changes proposed in this PR:

  • Adds vaultNamespace in secretsBackend.vault in values.yaml
  • This namespace is used for Vault namespace, this introduces one more way to specify namespace other than
    "{"connect": [{ "ca_config": [{ "namespace": "value"}]}]}" in connectCA.additionalConfig
  • If vaultNamespace is present, it automatically adds annotation below to the templates.
    vault:
      agentAnnotations: |
        vault.hashicorp.com/namespace: vaultNamespace

How I've tested this PR:
a. CI
b. Updated test TestVault_VaultNamespace
Test Steps -

1. kind create cluster --name=dc1
2. kind create cluster --name=dc2
3. cd acceptance/test/vault
4. go test ./... -p 1 -timeout 2h -failfast -no-cleanup-on-failure -debug-directory=/tmp/debug -use-kind -enable-multi-cluster -kube-contexts=kind-dc1,kind-dc2  -run ^TestVault

Output -

asheshvidyut@absolutelightning-H2GX766V9T acceptance/tests (NET-581-Configure-Vault-namespaces-for-Connect-CA-via-Helm-Stanza) » go test ./... -p 1 -timeout 2h -failfast -no-cleanup-on-failure -debug-directory=/tmp/debug -use-kind -enable-multi-cluster -kube-contexts=kind-dc1,kind-dc2  -run ^TestVault
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/api-gateway	0.492s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/basic	0.547s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/cli	0.529s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/cloud	0.565s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/config-entries	0.524s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/connect	0.556s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/consul-dns	0.543s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/example	0.540s
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/ingress-gateway	0.553s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/metrics	0.555s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/partitions	0.561s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/peering	0.568s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/sameness	0.552s
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/snapshot-agent	0.572s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/sync	0.554s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/terminating-gateway	0.553s [no tests to run]
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/vault	916.339s
ok  	github.com/hashicorp/consul-k8s/acceptance/tests/wan-federation	0.587s [no tests to run]

How I expect reviewers to test this PR:

Checklist:


Overview of commits

Maliz and others added 30 commits April 3, 2023 15:11
…xy-default

add failover policy to service resolver and proxy default
* Terraform: increase node sizes
* update GKE to use already created subnets
* Dispatch: dispatch to consul-k8s-workflows
* Update status on PRs
* Split pr and push into 2 different files so that context can be passed through
* Add a cleanup cron job
* draft of adding sameness group CRD

* move sameness group tests to ent test file

* update tests

* fix lint issues

* generate yaml and update helm charts

* update field descriptions and validation and its test

* remove unwanted files, add license comments back

* rename samenessgroups to samenessgroup

* fix resource names

* update failing unit test
trevorLeonHC and others added 17 commits August 23, 2023 09:27
* changes to connhelper, add job lifecycle test

* yaml fixes

* move around job yaml files, update grace period times

* yaml change

* timer change

* wait for job to start when deploying

* fix file paths

* Skip Lifecycle Test on t-proxy

---------

Co-authored-by: Thomas Eckert <teckert@hashicorp.com>
* change container creation order.

Change order of container creation so that envoy container is created before app container.

* change tests to fit proxy container added first

* add sidecar first iff lifecycle enabled

* update tests to include/exclude lifecycle

* container ordering in multiport + lifecycle, test case

* create changelog

* change exec calls to specify container

specify containers when exec'ing

* Update 2743.txt

* small fixes to appending sidecar
* Add readOnlyRootFilesystem to security context (#2771)

---------

Co-authored-by: mr-miles <miles.waller@gmail.com>
Co-authored-by: Paul Glass <pglass@hashicorp.com>
* feat: add helm value for consul resource-apis experiment

* Apply suggestions from code review

Co-authored-by: John Murret <john.murret@hashicorp.com>

* PR feedback part 2

---------

Co-authored-by: John Murret <john.murret@hashicorp.com>
…ityContext (#2787)

* Add NET_BIND_SERVICE capability to Consul's restricted securityContext

* Add changelog entry

* Update related bats tests

* Change type of release note
* Added tests for partition dns/pq
- did some light refactoring
…nnect-CA-via-Helm-Stanza/especially-set-fowl
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-581-Configure-Vault-namespaces-for-Connect-CA-via-Helm-Stanza/especially-set-fowl branch 2 times, most recently from 5c2fbb1 to 91df90c Compare September 8, 2023 09:24
@hashicorp-cla
Copy link

hashicorp-cla commented Sep 8, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


15 out of 16 committers have signed the CLA.

  • hc-github-team-consul-core
  • zalimeni
  • thisisnotashwin
  • missylbytes
  • nathancoleman
  • curtbushko
  • t-eckert
  • sarahalsmiller
  • hashi-derek
  • jm96441n
  • wilkermichael
  • DanStough
  • absolutelightning
  • trevorLeonHC
  • david-yu
  • Paul Glass

Paul Glass seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@absolutelightning absolutelightning marked this pull request as ready for review September 8, 2023 10:57
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.