Skip to content

support alibaba cloud ccm#119

Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
gujingit:master
Dec 2, 2021
Merged

support alibaba cloud ccm#119
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
gujingit:master

Conversation

@gujingit
Copy link
Copy Markdown
Contributor

No description provided.

@openshift-ci openshift-ci Bot requested review from Fedosin and lobziik September 13, 2021 03:26
@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 13, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 13, 2021

Hi @gujingit. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Copy Markdown
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

Please take a look at the cloud_test file again. There are several tests in there that the alibaba platform is needed to be added to, but I think you've only added the new platform to half of them

name: cloud-conf
items:
- key: cloud.conf
path: cloud-config.conf No newline at end of file
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.

Please ensure all files end with a new line (it helps with git diffs in the future)

--kubeconfig=/etc/kubernetes/cloud-controller-manager.conf \
--address=127.0.0.1 \
--allow-untagged-cloud=true \
--leader-elect=true \
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.

There are more leader election flags required to be configured, the unit tests should explain the issues (you can also copy/paste the leader election flags from any other platform)

Comment thread pkg/cloud/cloud_test.go Outdated
package cloud

import (
"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/alibaba"
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.

Please move this import into the group with the rest of the cloud providers, it should come before the AWS import on line 9

Comment thread pkg/cloud/cloud_test.go Outdated
isAzureStack: true,
expected: azurestack.GetResources(),
}, {
name: "AlibabaCloud resources are empty",
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 test description isn't correct

Suggested change
name: "AlibabaCloud resources are empty",
name: "AlibabaCloud resources returned as expected",

@JoelSpeed
Copy link
Copy Markdown
Contributor

There are several tests in there that the alibaba platform is needed to be added to, but I think you've only added the new platform to half of them

Never mind this comment, I just merged #121 which removes the extra lists. I think you should be fine after a rebase and all the tests should be covered

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 13, 2021
@JoelSpeed
Copy link
Copy Markdown
Contributor

Changes look good, but you'll need to run go mod vendor and then add the resulting changes as an additional commit to pass the verify step. Once that's done I think we are good to go :)

source /etc/kubernetes/apiserver-url.env
fi
exec /cloud-controller-manager \
--kubeconfig=/etc/kubernetes/cloud-controller-manager.conf \
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.

do we need this explicit kubeconfig flag given that we specify --use-service-account-credentials=true below?

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.

It's ok to remove the kubeconfig flag

@elmiko
Copy link
Copy Markdown
Contributor

elmiko commented Sep 16, 2021

i think we might be having some issues with our usage of --use-service-account-credentials=true, i've tried to capture what i think is happening in this issue openshift/cloud-provider-alibaba-cloud#6

@elmiko
Copy link
Copy Markdown
Contributor

elmiko commented Sep 17, 2021

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 20, 2021
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 22, 2021
@gujingit
Copy link
Copy Markdown
Contributor Author

@lobziik
Copy link
Copy Markdown
Contributor

lobziik commented Sep 22, 2021

Hi, what's the default image reference for alibaba ccm?

CloudControllerManagerOperator: "registry.ci.openshift.org/openshift:cluster-cloud-controller-manager-operator",

@gujingit Hi!

you could use quay.io/repository/openshift/origin-alibaba-cloud-controller-manager for alibaba ccm image reference, i think

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 10, 2021
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2021
@kwoodson
Copy link
Copy Markdown

@gujingit
Please run make fmt to clean up formatting.
Please also run make unit to verify the unit tests are passing. I see a few errors for the Alibaba test.

@gujingit
Copy link
Copy Markdown
Contributor Author

@kwoodson We have updated the dockerfile of https://github.com/kubernetes/cloud-provider-alibaba-cloud in order to pass the unit tests, please pull the latest code. Thanks.

@JoelSpeed
Copy link
Copy Markdown
Contributor

/approve

/hold

I just want to check that we have the alibaba CCM included in the release payload before we go ahead with merging this. Otherwise I think it's good to go

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 4, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 4, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 4, 2021
@kwoodson
Copy link
Copy Markdown

kwoodson commented Nov 8, 2021

@JoelSpeed How do we verify the Alibaba CCM is in the release payload?

@JoelSpeed
Copy link
Copy Markdown
Contributor

@Fedosin has put in the requests for this to be done, perhaps he can give an update

@kwoodson
Copy link
Copy Markdown

@JoelSpeed I have seen the latest image is being built in the 4.10 image. I saw the ose-alibaba-cloud-controller-manager.yaml.

I think this PR is ready.

Copy link
Copy Markdown
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

/lgtm

are we including the images yet @JoelSpeed ?

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2021
@JoelSpeed
Copy link
Copy Markdown
Contributor

The images are still marked as WIP, we need to bring in some changes from the upstream provider to fix the build before we can merge this

@kwoodson
Copy link
Copy Markdown

@elmiko @JoelSpeed Looks like the fix to the -mod readonly has merged here kubernetes/cloud-provider-alibaba-cloud@ef08fd2. What is the process to force an update?

@elmiko
Copy link
Copy Markdown
Contributor

elmiko commented Nov 23, 2021

@elmiko @JoelSpeed Looks like the fix to the -mod readonly has merged here kubernetes/cloud-provider-alibaba-cloud@ef08fd2. What is the process to force an update?

good question, i imagine we will need to update our code repo to match but the complicating factor here is the refactor of the code base. if we are good to move forward with testing the latest releases to the ccm then we could manually make a merge from the upstream to our copy. i think @JoelSpeed was looking into this.

@kwoodson
Copy link
Copy Markdown

@gujingit Now that the CCM has been updated, I found that there are a couple of options that are not supported. These two options are causing a failure to start the CCM:

unknown flag: --allow-untagged-cloud
unknown flag: --allocate-node-cidrs

Is there a plan to revisit this PR and test that it works? I also noticed that when launching the container that I received the following error message:

/bin/sh: /cloud-controller-manager: not found

I was able to fix this by using CGO_ENABLED=0. This enabled me to run the container.

@gujingit
Copy link
Copy Markdown
Contributor Author

@gujingit Now that the CCM has been updated, I found that there are a couple of options that are not supported. These two options are causing a failure to start the CCM:

unknown flag: --allow-untagged-cloud
unknown flag: --allocate-node-cidrs

Is there a plan to revisit this PR and test that it works? I also noticed that when launching the container that I received the following error message:

/bin/sh: /cloud-controller-manager: not found

I was able to fix this by using CGO_ENABLED=0. This enabled me to run the container.

@kwoodson @mtulio we have added these options, please pull the upstream

@kwoodson
Copy link
Copy Markdown

kwoodson commented Dec 2, 2021

Barring any other feedback I believe this is ready to go.

cc @JoelSpeed @elmiko

@JoelSpeed
Copy link
Copy Markdown
Contributor

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 2, 2021
@openshift-bot
Copy link
Copy Markdown

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@kwoodson
Copy link
Copy Markdown

kwoodson commented Dec 2, 2021

/retest-required

@openshift-bot
Copy link
Copy Markdown

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 2, 2021

@gujingit: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/verify f70a24b link /test verify
ci/prow/e2e-vsphere-ccm a49b6c3 link false /test e2e-vsphere-ccm
ci/prow/e2e-gcp-ccm a49b6c3 link false /test e2e-gcp-ccm
ci/prow/e2e-vsphere-ccm-install a49b6c3 link false /test e2e-vsphere-ccm-install
ci/prow/e2e-azure a49b6c3 link false /test e2e-azure
ci/prow/e2e-gcp-ccm-install a49b6c3 link false /test e2e-gcp-ccm-install
ci/prow/e2e-aws-ccm-install a49b6c3 link false /test e2e-aws-ccm-install
ci/prow/e2e-azure-upgrade a49b6c3 link false /test e2e-azure-upgrade
ci/prow/e2e-azure-ccm-install a49b6c3 link false /test e2e-azure-ccm-install
ci/prow/e2e-openstack-ccm a49b6c3 link false /test e2e-openstack-ccm

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Copy Markdown

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Copy Markdown

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 2c0f143 into openshift:master Dec 2, 2021
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants