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 Adds fields for PassiveHealthCheck on IngressGateway into release/1.0.x #2858

Merged
merged 1 commit into from
Aug 30, 2023

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #2796 to be assessed for backporting due to the inclusion of the label backport/1.0.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:
@missylbytes
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:

How I've tested this PR:
Install Consul locally with the following values:

global:
  image: hashicorppreview/consul:1.17-dev
  imageK8S: YOUR_LOCALLY_BUILT_IMAGE_FROM_THIS_PR

ingressGateways:
  enabled: true
  defaults:
    replicas: 1
  gateways:
    - name: ingress-gateway
      service:
        type: ClusterIP

Running kubectl apply on the following IngressGateway configuration:

apiVersion: consul.hashicorp.com/v1alpha1
kind: IngressGateway
metadata:
  name: ingress-gateway
spec:
  defaults:
    passiveHealthCheck:
      interval: "10s"
      maxFailures: 5
      enforcingConsecutive5xx: 100
      maxEjectionPercent: 10
      baseEjectionTime: "10s"

The apply should succeed and you should be able to see the PassiveHealthCheck configured correctly in Consul:
consul config read -kind ingress-gateway -name ingress-gateway

{
    "Kind": "ingress-gateway",
    "Name": "ingress-gateway",
    "TLS": {
        "Enabled": false
    },
    "Listeners": null,
    "Meta": {
        "consul.hashicorp.com/source-datacenter": "dc1",
        "external-source": "kubernetes"
    },
    "Defaults": {
        "MaxConnections": 0,
        "MaxPendingRequests": 0,
        "MaxConcurrentRequests": 0,
        "PassiveHealthCheck": {
            "Interval": 10000000000,
            "MaxFailures": 5,
            "EnforcingConsecutive5xx": 100,
            "MaxEjectionPercent": 10,
            "BaseEjectionTime": 10000000000
        }
    },
    "CreateIndex": 88,
    "ModifyIndex": 88
}

How I expect reviewers to test this PR:

Checklist:


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/net-5164/verbally-vital-collie branch 2 times, most recently from fa82aec to def3136 Compare August 29, 2023 20:19
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 29, 2023

CLA assistant check
All committers have signed the CLA.

…iceDefault CRDs (#2796)

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
@missylbytes missylbytes force-pushed the backport/net-5164/verbally-vital-collie branch from def3136 to 051071c Compare August 30, 2023 13:44
@missylbytes missylbytes marked this pull request as ready for review August 30, 2023 13:45
@missylbytes missylbytes merged commit 4e48efa into release/1.0.x Aug 30, 2023
3 checks passed
@missylbytes missylbytes deleted the backport/net-5164/verbally-vital-collie branch August 30, 2023 14:26
kisunji pushed a commit that referenced this pull request Sep 20, 2023
kisunji pushed a commit that referenced this pull request Sep 20, 2023
* Update dependencies

* Prepare release

* Revert "Backport of Adds fields for PassiveHealthCheck on IngressGateway into release/1.0.x (#2858)"

This reverts commit 4e48efa.

* Adjust api version to one that references consul 1.14.x

* Remove reverted changelog entry
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.

3 participants