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

Add annotation hashes for Manager / KB to roll pods over on kb cert c… #1119

Merged

Conversation

Brian-McM
Copy link
Contributor

…hange

Description

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

  • Milestone set according to targeted release.
  • Appropriate labels:
    • kind/bug if this is a bugfix.
    • kind/enhancement if this is a a new feature.
    • enterprise if this PR applies to Calico Enterprise only.

Copy link
Contributor

@lmm lmm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but maybe @tmjd can take a look too

@@ -109,6 +109,8 @@ const (
EsManagerRoleBinding = "es-manager"
EsKubeControllerRole = "es-calico-kube-controllers"
EsKubeControllerRoleBinding = "es-calico-kube-controllers"

KibanaTLSAnnotationHash = "hash.operator.tigera.io/tls-certificate-secret"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: maybe there could be better names for the variable and value - they don't really line up well

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use hash.operator.tigera.io/kibana-secrets here too?

Copy link
Member

@tmjd tmjd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good, I'd like to see consistency in the naming though. (I know the operator isn't very consistent with some names but it won't get better if we don't try 😀 )
For expediency I'm going to approve, fixing the names isn't required and if you fix it I don't need to review it again.

@tmjd tmjd added docs-not-required enterprise Feature applies to enterprise only and removed docs-pr-required labels Jan 30, 2021
@lmm lmm merged commit dd610d0 into tigera:master Jan 31, 2021
lmm pushed a commit to lmm/operator that referenced this pull request Jan 31, 2021
lmm added a commit that referenced this pull request Jan 31, 2021
…hange (#1119) (#1124)

Co-authored-by: Brian McMahon <brianmcmahon135@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants