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.

Sign up for GitHub

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

Jump to bottom

Default to latest staging image for AWS CCM #12291

Merged
merged 1 commit into from
Sep 12, 2021
Merged

Default to latest staging image for AWS CCM #12291

merged 1 commit into from
Sep 12, 2021

Conversation

hakman
Copy link
Member

@hakman hakman commented Sep 9, 2021

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/addons labels Sep 9, 2021
olemarkus
olemarkus reviewed Sep 9, 2021
View reviewed changes
upup/pkg/fi/cloudup/template_functions.go Outdated
// the Kubernetes Version
func (tf *TemplateFunctions) AWSCCMTag() (string, error) {
func (tf *TemplateFunctions) AWSCCMImage() (string, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should move this to pkg/model/components/awscloudcontrollermanager.go with the other arguments?
then we only need {{ .ExternalCloudControllerManager.Image }} in the template.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think @rifelpet did that in #12104?

@olemarkus
Copy link
Member

You're right. Should hold for that one to go in then?

@hakman
Copy link
Member Author

hakman commented Sep 9, 2021

You're right. Should hold for that one to go in then?

I don' mind, noticed later.

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 9, 2021
@hakman hakman force-pushed the aws-ccm-1.22.0-alpha.0 branch from c9ae8e8 to cd29df0 Compare September 11, 2021 15:36
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 11, 2021
@hakman hakman changed the title Update provider-aws/cloud-controller-manager to v1.22.0-alpha.0 Default to latest staging image for AWS CCM Sep 11, 2021
@hakman hakman force-pushed the aws-ccm-1.22.0-alpha.0 branch from cd29df0 to 2b102c3 Compare September 11, 2021 15:37
@hakman hakman force-pushed the aws-ccm-1.22.0-alpha.0 branch from 2b102c3 to cf8b11b Compare September 11, 2021 15:38
@kubernetes kubernetes deleted a comment from k8s-ci-robot Sep 11, 2021
@hakman
Copy link
Member Author

hakman commented Sep 11, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 11, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 12, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit 2e3ca72 into kubernetes:master Sep 12, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 12, 2021
@hakman hakman mentioned this pull request Sep 12, 2021
Merged
k8s-ci-robot added a commit that referenced this pull request Sep 12, 2021
@k8s-ci-robot
Merge pull request #12318 from hakman/automated-cherry-pick-of-#12104-#…
d80e56b 
…12291-upstream-release-1.22

Automated cherry pick of #12104: Fix cluster spec typo in CCM integration tests
#12291: Default to latest staging image for AWS CCM
@hakman hakman deleted the aws-ccm-1.22.0-alpha.0 branch October 22, 2021 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olemarkus olemarkus olemarkus approved these changes

@rifelpet rifelpet Awaiting requested review from rifelpet

Assignees

@olemarkus olemarkus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.
3 participants
@hakman @olemarkus @k8s-ci-robot