Skip to content

Plumb revision annotations through to services and deployments#576

Merged
mattmoor merged 1 commit intoknative:masterfrom
bsnchan:propagate_annotations
Apr 11, 2018
Merged

Plumb revision annotations through to services and deployments#576
mattmoor merged 1 commit intoknative:masterfrom
bsnchan:propagate_annotations

Conversation

@bsnchan
Copy link
Copy Markdown
Contributor

@bsnchan bsnchan commented Apr 3, 2018

Signed-off-by: Brenda Chan brchan@pivotal.io

Fixes Issue #359

Proposed Changes

  • Only propagate the annotations specified under a
    configuration's spec.RevisionTemplate.metadata.annotations

  • Adds test to ensure revisionTemplate annotations are passed to revisions

* Only propagate the annotations specified under a
configuration's spec.RevisionTemplate.metadata.annotations

* Adds test to ensure revisionTemplate annotations are passed to revisions

knative/serving#359
Signed-off-by: Brenda Chan <brchan@pivotal.io>
@googlebot
Copy link
Copy Markdown

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@google-prow-robot google-prow-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 3, 2018
@dprotaso
Copy link
Copy Markdown
Member

dprotaso commented Apr 3, 2018

I'm always ok!

Name: controller.GetRevisionAutoscalerName(u),
Namespace: AutoscalerNamespace,
Labels: MakeElaResourceLabels(u),
Annotations: MakeElaResourceAnnotations(u),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This pulls in the istio sidecar annotation as well, is that something that we want? Are there any side effects on this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This pulls in the istio sidecar annotation as well

Only if a RevisionTemplate's metadata has specified it. Is that your concern?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I was just curious if this is what we want and if the istio sidecar goes in there, will it impact anything?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Will do some digging to confirm

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We confirmed that if the RevisionTemplate has an Istio sidecar annotation on the service, it would not impact anything since the annotation only applies to the Pods.

See the istio webhook config for evidence

Labels: MakeElaResourceLabels(u),
Name: controller.GetRevisionAutoscalerName(u),
Namespace: AutoscalerNamespace,
Labels: MakeElaResourceLabels(u),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should we apply the custom annotations and labels to autoscaler pod or should we skip this part? autoscaler is a system component and it might be better to keep it hidden from the user and not copy labels and annotations that the user specified to it. What do you think?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We chose to plumb the labels and annotations through to the autoscaler as well because we thought the intent was that the user can then target all services and pods that are created as part of creating a Configuration.

@bsnchan
Copy link
Copy Markdown
Contributor Author

bsnchan commented Apr 6, 2018

@mdemirhan @vaikas-google Let us know what you think of the comments above and if you feel strongly about any of them.

@mdemirhan
Copy link
Copy Markdown
Contributor

I am fine with autoscaler pod having the labels as well.
/lgtm

@google-prow-robot google-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2018
@vaikas
Copy link
Copy Markdown
Contributor

vaikas commented Apr 6, 2018

/lgtm

@google-prow-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bsnchan, mdemirhan, vaikas-google

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-prow-robot google-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2018
@vaikas
Copy link
Copy Markdown
Contributor

vaikas commented Apr 6, 2018

Hey @dprotaso that "I'm always ok!" comment was giving your approval for your commits getting merged? Just checking before hitting the approve button :)

@dprotaso
Copy link
Copy Markdown
Member

dprotaso commented Apr 6, 2018 via email

@mattmoor
Copy link
Copy Markdown
Member

I believe this is completely signed off, but probably won't auto-merge due to the CLA issues (cc @adrcunha ).

I'm going to merge this now as @dprotaso has confirmed things the hard way :)

@mattmoor mattmoor merged commit 715578f into knative:master Apr 11, 2018
@adrcunha
Copy link
Copy Markdown
Contributor

I believe this is completely signed off, but probably won't auto-merge due to the CLA issues

The PR was in the merge pool, but it vanished since this was manually merged.

@krzyzacy what would be the right command/approach here? The help page doesn't show any explicit command for "author consent", and I'm not sure if /skip, /approval or /ok-to-test would help here.

@krzyzacy
Copy link
Copy Markdown

looks like cla need to be re-signed? cc @cjwagner

nak3 added a commit to nak3/serving that referenced this pull request Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants