Skip to content

Manual backport of correct prometheus port and scheme annotations if tls is enabled (#2782)#2878

Merged
rigalGit merged 1 commit intorelease/1.2.xfrom
NET-2276/prometheus-annotation-fix-https_1.2.x
Aug 31, 2023
Merged

Manual backport of correct prometheus port and scheme annotations if tls is enabled (#2782)#2878
rigalGit merged 1 commit intorelease/1.2.xfrom
NET-2276/prometheus-annotation-fix-https_1.2.x

Conversation

@rigalGit
Copy link
Contributor

Changes proposed in this PR:
Fixing #1856

  • Correct prometheus port ( 8501) and scheme ( https) annotations if tls is enabled.
  • Setting prometheus scheme to http if tls is disabled.

How I've tested this PR:
Created a local cluster using kind and checked prometheus annotations on consul-server pod using kubectl.

kubectl get pod consul-server-0 --namespace consul -o jsonpath='{.metadata.annotations}'

How I expect reviewers to test this PR:

Checklist:

* correct prometheus port and scheme annotations if tls is enabled
@Ganeshrockz Ganeshrockz changed the title correct prometheus port and scheme annotations if tls is enabled (#2782) Manual backport of correct prometheus port and scheme annotations if tls is enabled (#2782) Aug 31, 2023
@rigalGit rigalGit added area/acls Related to ACLs pr/no-backport signals that a PR will not contain a backport label and removed area/acls Related to ACLs labels Aug 31, 2023
@rigalGit rigalGit merged commit 60bd412 into release/1.2.x Aug 31, 2023
@rigalGit rigalGit deleted the NET-2276/prometheus-annotation-fix-https_1.2.x branch August 31, 2023 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants