hc-github-team-consul-core
e17c8f7a9a
Backport of Change docs to say 168h instead of 7d for server_rejoin_age_max into release/1.15.x ( #18155 )
...
## Backport
This PR is auto-generated from #18154 to be assessed for backporting due
to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
---
### Description
Addresses
https://github.com/hashicorp/consul/pull/17171#issuecomment-1636930705
### Testing & Reproduction steps
<!--
* In the case of bugs, describe how to replicate
* If any manual tests were done, document the steps and the conditions
to replicate
* Call out any important/ relevant unit tests, e2e tests or integration
tests you have added or are adding
-->
### Links
<!--
Include any links here that might be helpful for people reviewing your
PR (Tickets, GH issues, API docs, external benchmarks, tools docs, etc).
If there are none, feel free to delete this section.
Please be mindful not to leak any customer or confidential information.
HashiCorp employees may want to use our internal URL shortener to
obfuscate links.
-->
### PR Checklist
* [ ] updated test coverage
* [ ] external facing docs updated
* [ ] appropriate backport labels added
* [ ] not a security concern
---
<details>
<summary> Overview of commits </summary>
- f5a6411ce7
</details>
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-07-17 17:09:50 +00:00
hc-github-team-consul-core
af21077c8d
Backport of Docs: fix unmatched bracket for health checks page into release/1.15.x ( #18136 )
...
## Backport
This PR is auto-generated from #18134 to be assessed for backporting due
to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
---
### Description
- Fix unmatched bracket in the
[doc](https://developer.hashicorp.com/consul/docs/services/usage/checks#ttl-check-configuration )
(see the following screenshot of the page)
<img width="618" alt="Screenshot 2023-07-13 at 9 01 19 PM"
src="https://github.com/hashicorp/consul/assets/463631/20707735-906f-4b06-999d-44e6329a9fec ">
### Testing & Reproduction steps
<!--
* In the case of bugs, describe how to replicate
* If any manual tests were done, document the steps and the conditions
to replicate
* Call out any important/ relevant unit tests, e2e tests or integration
tests you have added or are adding
-->
### Links
<!--
Include any links here that might be helpful for people reviewing your
PR (Tickets, GH issues, API docs, external benchmarks, tools docs, etc).
If there are none, feel free to delete this section.
Please be mindful not to leak any customer or confidential information.
HashiCorp employees may want to use our internal URL shortener to
obfuscate links.
-->
### PR Checklist
* [ ] updated test coverage
* [ ] external facing docs updated
* [ ] appropriate backport labels added
* [ ] not a security concern
---
<details>
<summary> Overview of commits </summary>
- d40243b3a3
</details>
Co-authored-by: cskh <hui.kang@hashicorp.com>
2023-07-14 14:13:59 +00:00
hc-github-team-consul-core
f8760eeacf
backport of commit 5403b62315
( #18122 )
...
Co-authored-by: nv-hashi <80716011+nv-hashi@users.noreply.github.com>
2023-07-13 02:10:02 +00:00
hc-github-team-consul-core
1bbf911e2c
backport of commit b9b58ec763
( #18109 )
...
Co-authored-by: John Murret <john.murret@hashicorp.com>
2023-07-12 17:26:45 +00:00
hc-github-team-consul-core
3f475dedf7
Backport of Docs for dataplane upgrade on k8s into release/1.15.x ( #18104 )
...
* backport of commit 0d7bee8adc
* backport of commit 408cbe8ae0
* backport of commit a0854784dc
* backport of commit 71c4c6564f
* backport of commit 0c060fa2ba
---------
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-07-12 17:11:54 +00:00
hc-github-team-consul-core
fc52598d55
Backport of Fix a couple typos in Agent Telemetry Metrics docs into release/1.15.x ( #18083 )
...
* backport of commit 58ef5fdd8f
* backport of commit 857427ae8c
---------
Co-authored-by: josh <josh.timmons@hashicorp.com>
2023-07-11 20:35:43 +00:00
David Yu
e261d0a25a
docs - helm consul k8s 1.1.x helm chart reference ( #18057 )
...
* add helm chart changes
* ran again with updated values
Co-authored-by: Dan Stough <dan.stough@hashicorp.com>
2023-07-10 12:39:58 -07:00
hc-github-team-consul-core
b7563515ce
Backport of Fix removed service-to-service peering links into release/1.15.x ( #18018 )
...
* no-op commit due to failed cherry-picking
* Fix removed service-to-service peering links (#17221 )
* docs: fix removed service-to-service peering links
* docs: extend peering-via-mesh-gateways intro (thanks @trujillo-adam)
---------
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Michael Hofer <karras@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2023-07-07 15:12:49 -07:00
hc-github-team-consul-core
2a6e0848cf
Backport of docs - add jobs use case for service mesh k8s into release/1.15.x ( #18042 )
...
* manually resolve conflicts
* remove extraneous heading
* address feedback
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-07-07 10:26:56 -07:00
hc-github-team-consul-core
4d460a8b7d
Backport of docs - add service sync annotations and k8s service weight annotation into release/1.15.x ( #18039 )
...
* backport of commit e1bf428494
* backport of commit ddf214e638
* backport of commit e41bd9c4e3
* backport of commit b9cfc86e14
* backport of commit 0ddf013d6c
* backport of commit 1b0b513b05
* backport of commit 29442ad641
* backport of commit 5e7ddf5c7e
* backport of commit f2b6fa7b43
* backport of commit 83b84a985a
* backport of commit 56d81738cc
* backport of commit 0ab44f06c7
* backport of commit 69c99fbccb
* backport of commit b79e1245c1
* backport of commit fb1441976b
* backport of commit 3b7b2a0424
---------
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-07-06 20:50:18 +00:00
hc-github-team-consul-core
e1b6f23787
backport of commit 4b1ed38b41
( #18025 )
...
Co-authored-by: J.C. Jones <jc@letsencrypt.org>
2023-07-05 15:24:17 -07:00
hc-github-team-consul-core
3011885ad8
backport of commit f6df37444b
( #17994 )
...
Co-authored-by: Evan Phoenix <evan@phx.io>
2023-07-01 02:15:30 +00:00
hc-github-team-consul-core
2831e1acdc
backport of commit ff6b620db7
( #17923 )
...
Co-authored-by: natemollica-dev <57850649+natemollica-nm@users.noreply.github.com>
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-06-30 03:11:01 +00:00
hc-github-team-consul-core
c71d06733c
Backport of Fix streaming backend link into release/1.15.x ( #17960 )
...
* backport of commit 4f7d21da6c
* backport of commit d1ba0e877c
---------
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-06-29 19:41:27 +00:00
hc-github-team-consul-core
c53d4051bb
Backport of Reference hashicorp/consul instead of consul for Docker image into release/1.15.x ( #17919 )
...
* backport of commit d490377d50
* Reference hashicorp/consul instead of consul for Docker image (#17914 )
* Reference hashicorp/consul instead of consul for Docker image
* Update Make targets that pull consul directly
---------
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
2023-06-28 00:43:29 +00:00
hc-github-team-consul-core
df552274c3
backport of commit a87f4e37b9
( #17906 )
...
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2023-06-27 17:52:41 +00:00
hc-github-team-consul-core
4894d99de2
backport of commit 38301b5ccc
( #17898 )
...
Co-authored-by: mr-miles <miles.waller@gmail.com>
2023-06-27 09:40:01 -07:00
hc-github-team-consul-core
df7795ebd0
Backport of docs: update upgrade to consul-dataplane docs on k8s into release/1.15.x ( #17864 )
...
* backport of commit ad7cbd5c70
* backport of commit 122b50b088
* backport of commit fea8da7109
---------
Co-authored-by: Iryna Shustava <iryna@hashicorp.com>
2023-06-23 22:45:37 +00:00
hc-github-team-consul-core
93b152c82d
backport of commit 9e0e1160d5
( #17857 )
...
Co-authored-by: V. K <cn007b@gmail.com>
2023-06-23 18:56:46 +00:00
hc-github-team-consul-core
27332fce66
Backport of Generate helm docs for release consul-k8s 1.1.2 into release/1.15.x ( #17573 )
...
* no-op commit due to failed cherry-picking
* file not cherrypicked
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Curt Bushko <cbushko@gmail.com>
Co-authored-by: John Murret <john.murret@hashicorp.com>
2023-06-22 14:47:09 -04:00
hc-github-team-consul-core
a1027bf283
Backport of Fix formatting for webhook-certs Consul tutorial into release/1.15.x ( #17819 )
...
* no-op commit due to failed cherry-picking
* Fix formatting for webhook-certs Consul tutorial (#17810 )
* Fix formatting for webhook-certs Consul tutorial
* Make a small grammar change to also pick up whitespace changes necessary for formatting
---------
Co-authored-by: David Yu <dyu@hashicorp.com>
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Steven Zamborsky <97125550+stevenzamborsky@users.noreply.github.com>
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-06-21 23:21:31 -07:00
hc-github-team-consul-core
a04cbd6599
Backport of Fix Docs for Trails Leader By into release/1.15.x ( #17803 )
...
* backport of commit 2f94024b35
* backport of commit 7626d0992d
* backport of commit 79aabc958a
* backport of commit 44eee4168b
* merge conf resolve
* merge conf resolve
* Fix Docs for Trails Leader By (#17763 )
* init
* fix tests
* added -detailed in docs
* added change log
* fix doc
* checking for entry in map
* fix tests
* removed detailed flag
* removed detailed flag
* revert unwanted changes
* removed unwanted changes
* updated change log
* pr review comment changes
* pr comment changes single API instead of two
* fix change log
* fix tests
* fix tests
* fix test operator raft endpoint test
* Update .changelog/17582.txt
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
* nits
* updated docs
* explanation added
* fix doc
* fix docs
---------
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
---------
Co-authored-by: Ashesh Vidyut <ashesh.vidyut@hashicorp.com>
Co-authored-by: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
2023-06-21 11:57:39 +05:30
hc-github-team-consul-core
4ad6aaab72
Backport of Updated docs added explanation. into release/1.15.x ( #17792 )
...
* backport of commit 2f94024b35
* backport of commit 7626d0992d
* backport of commit 79aabc958a
* backport of commit 44eee4168b
* fix conflicts
* Updated docs added explanation. (#17751 )
* init
* fix tests
* added -detailed in docs
* added change log
* fix doc
* checking for entry in map
* fix tests
* removed detailed flag
* removed detailed flag
* revert unwanted changes
* removed unwanted changes
* updated change log
* pr review comment changes
* pr comment changes single API instead of two
* fix change log
* fix tests
* fix tests
* fix test operator raft endpoint test
* Update .changelog/17582.txt
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
* nits
* updated docs
* explanation added
---------
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
---------
Co-authored-by: Ashesh Vidyut <ashesh.vidyut@hashicorp.com>
Co-authored-by: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
2023-06-21 11:47:04 +05:30
hc-github-team-consul-core
6a833cd2cb
Backport of [NET-3865] [Supportability] Additional Information in the output of 'consul operator raft list-peers' into release/1.15.x ( #17737 )
...
* backport of commit 2f94024b35
* backport of commit 7626d0992d
* backport of commit 79aabc958a
* backport of commit 44eee4168b
* merge commit fa40654
* fix merge conf
* [NET-3865] [Supportability] Additional Information in the output of 'consul operator raft list-peers' (#17582 )
* init
* fix tests
* added -detailed in docs
* added change log
* fix doc
* checking for entry in map
* fix tests
* removed detailed flag
* removed detailed flag
* revert unwanted changes
* removed unwanted changes
* updated change log
* pr review comment changes
* pr comment changes single API instead of two
* fix change log
* fix tests
* fix tests
* fix test operator raft endpoint test
* Update .changelog/17582.txt
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
* nits
* updated docs
---------
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
* [NET-3865] [Supportability] Additional Information in the output of 'consul operator raft list-peers' (#17582 )
* init
* fix tests
* added -detailed in docs
* added change log
* fix doc
* checking for entry in map
* fix tests
* removed detailed flag
* removed detailed flag
* revert unwanted changes
* removed unwanted changes
* updated change log
* pr review comment changes
* pr comment changes single API instead of two
* fix change log
* fix tests
* fix tests
* fix test operator raft endpoint test
* Update .changelog/17582.txt
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
* nits
* updated docs
---------
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
* resolve diff
* fix merge conf
* fix merge conf
* removed detailed flag
---------
Co-authored-by: Ashesh Vidyut <ashesh.vidyut@hashicorp.com>
Co-authored-by: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>
Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
2023-06-18 04:29:38 +00:00
hc-github-team-consul-core
633b1cdea9
Backport of [NET-4107][Supportability] Log Level set to TRACE and duration set to 5m for consul-debug into release/1.15.x ( #17727 )
...
* backport of commit 9d72a262f3
* backport of commit 9b9bb8d206
* backport of commit ba44809297
---------
Co-authored-by: Ashesh Vidyut <ashesh.vidyut@hashicorp.com>
Co-authored-by: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>
2023-06-17 17:11:12 +00:00
hc-github-team-consul-core
386f0f153f
backport of commit 3b4e0abbb4
( #17784 )
...
Co-authored-by: Mark Campbell-Vincent <mnmvincent@gmail.com>
2023-06-15 21:48:14 +00:00
hc-github-team-consul-core
3528b009ba
Backport of added redirects and updated links into release/1.15.x ( #17766 )
...
* no-op commit due to failed cherry-picking
* added redirects and updated links (#17764 )
cherry-picking fixes for broken links
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2023-06-15 12:13:03 -07:00
hc-github-team-consul-core
07d27a8a3a
backport of commit 3db13c2185
( #17772 )
...
Co-authored-by: John Murret <john.murret@hashicorp.com>
2023-06-15 17:44:46 +00:00
hc-github-team-consul-core
ce750ff61a
backport of commit 74bf6a76ac
( #17761 )
...
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2023-06-15 16:26:49 +00:00
hc-github-team-consul-core
ad39814671
NET-1825: New ACL token creation docs ( #16465 ) ( #17734 )
...
Co-authored-by: Paul Glass <pglass@hashicorp.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
2023-06-14 14:52:39 +00:00
hc-github-team-consul-core
a092aadf74
backport of commit 498693f24f
( #17721 )
...
Co-authored-by: Tobias Birkefeld <t@craxs.de>
2023-06-13 17:44:08 -07:00
hc-github-team-consul-core
9dd6040180
Backport of Remove extraneous version info for Config entries into release/1.15.x ( #17717 )
...
* backport of commit c02c4445cc
* backport of commit 3237e24a11
* backport of commit 3bbd88fb79
---------
Co-authored-by: David Yu <dyu@hashicorp.com>
2023-06-13 23:08:06 +00:00
hc-github-team-consul-core
df69d18c26
Backport of Fix metric names in Consul agent telemetry docs into release/1.15.x ( #17590 )
...
* backport of commit 8144eb0833
* backport of commit 4d3f2e01a4
---------
Co-authored-by: josh <josh.timmons@hashicorp.com>
2023-06-12 18:33:03 -07:00
hc-github-team-consul-core
75f112c824
Backport of Fix two WAL metrics in docs/agent/telemetry.mdx into release/1.15.x ( #17682 )
...
* backport of commit 0191cb1103
* backport of commit 6c245e7960
---------
Co-authored-by: josh <josh.timmons@hashicorp.com>
2023-06-12 18:29:40 -07:00
hc-github-team-consul-core
2c2d4550c4
backport of commit 9ec2b3807a
( #17671 )
...
Co-authored-by: Hariram Sankaran <56744845+ramramhariram@users.noreply.github.com>
2023-06-12 16:35:07 -07:00
hc-github-team-consul-core
7792c27d11
Backport of docs: update the defaults for request limits into release/1.15.x ( #17466 )
...
* no-op commit due to failed cherry-picking
* docs: update the defaults for request limits (#17437 )
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: John Murret <john.murret@hashicorp.com>
2023-06-12 11:26:26 -06:00
hc-github-team-consul-core
082de092c6
backport of commit ef688704aa
( #17622 )
...
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2023-06-08 20:55:44 +00:00
hc-github-team-consul-core
104100d46b
Backport of docs: clarify the behavior of prepending hostname to metrics into release/1.15.x ( #17580 )
...
* backport of commit 81fe71d411
* backport of commit 8d6b7070dd
---------
Co-authored-by: cskh <hui.kang@hashicorp.com>
2023-06-06 23:25:01 -04:00
hc-github-team-consul-core
d2a1795176
Backport of add docs for consul-k8s config read command into release/1.15.x ( #17473 )
...
* backport of commit 6e537507ef
* backport of commit fbdab01e85
* trigger ci
---------
Co-authored-by: Hans Hasselberg <hans@hashicorp.com>
2023-06-05 08:14:37 -07:00
hc-github-team-consul-core
34431034c1
backport of commit 50e40ecc14
( #17550 )
...
Co-authored-by: Luiz Aoqui <luiz@hashicorp.com>
2023-06-01 15:53:48 -07:00
Michael Zalimeni
1a155e2302
Update list of Envoy versions ( #17545 )
2023-06-01 14:50:16 -07:00
hc-github-team-consul-core
f9d3f8a065
Backport of hoststats: add package for collecting host statistics including cpu memory and disk usage into release/1.15.x ( #17532 )
...
* backport of commit fafb68b28d
* backport of commit baffef45bd
* backport of commit 369619ba3a
* backport of commit b7f5032136
* backport of commit ac6071721c
* backport of commit 2a3dd5066a
* backport of commit 50621fa098
* backport of commit 6e3ceb0347
* backport of commit bf69a829f2
---------
Co-authored-by: Nick Ethier <nethier@hashicorp.com>
2023-05-31 18:09:13 +00:00
hc-github-team-consul-core
676c51cc08
backport of commit cfd06f4b28
( #17480 )
...
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2023-05-25 21:25:11 +00:00
hc-github-team-consul-core
aa73c4f72c
backport of commit ee51fc87b4
( #17472 )
...
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2023-05-25 09:30:57 -07:00
hc-github-team-consul-core
58806aa0a8
backport of commit a6322d8c94
( #17444 )
...
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2023-05-24 16:05:01 +00:00
hc-github-team-consul-core
a5960414a1
Backport of [OSS] gRPC Blocking Queries into release/1.15.x ( #17441 )
...
* backport of feat: initial grpc blocking queries (11b1dd2
)
* backport of changelog and docs update (5ceef20
)
---------
Co-authored-by: DanStough <dan.stough@hashicorp.com>
2023-05-24 11:35:45 -04:00
hc-github-team-consul-core
e2d9d3992f
Backport of docs: Reference pages for service-router and service-resolver config entries into release/1.15.x ( #17397 )
...
* no-op commit due to failed cherry-picking
* docs: Reference pages for service-router and service-resolver config entries (#17145 )
* service-resolve configuration entry reference
* Updates
* missing backtick
* service router configuration entry reference
* link fixes + tab fixes
* link and tab fixes
* link fixes
* service resolver improvements
* hierarchy fixes
* spacing
* links + formatting
* proofing fixes
* mmore fixes
* Apply suggestions from code review
suggestions from code review for service resolver
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* policy sections edits
* service router code review
* Tables to sections - service router HCL
* YAML tables to sections
* formatting fixes
* converting tables to sections - service resolver
* final tables to sections
* Adjustments/alignments
* nanosecond fix
* Update website/content/docs/connect/config-entries/service-router.mdx
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* link to filter example config
---------
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* Update website/content/docs/connect/config-entries/service-resolver.mdx
* merge fix
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: boruszak <jeffrey.boruszak@hashicorp.com>
2023-05-19 11:23:45 -07:00
Ashvitha
87d3f45ab5
Rename hcp-metrics-collector to consul-telemetry-collector ( #17327 ) ( #17412 )
...
* Rename hcp-metrics-collector to consul-telemetry-collector
* Fix docs
* Fix doc comment
---------
Co-authored-by: Connor <connor.kelly@hashicorp.com>
2023-05-19 11:33:36 -04:00
hc-github-team-consul-core
b345f184c2
backport of commit 5a29f9b4f7
( #17408 )
...
Co-authored-by: trujillo-adam <ajosetru@gmail.com>
2023-05-18 17:15:21 +00:00
Jeff Boruszak
ee06276cd4
docs: Fix merge conflicts ( #17405 )
...
* no-op commit due to failed cherry-picking
* docs: connect-service-upstreams annotation fixes (#17312 )
* corrections
* fixes
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Update website/content/docs/k8s/annotations-and-labels.mdx
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
* Switching order of labeled/unlabeled
---------
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* Fix merge conflict
---------
Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2023-05-18 10:06:50 -07:00