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

allow kubeadm image repo customization #26

Merged
merged 3 commits into from
Aug 27, 2019

Conversation

figo
Copy link
Contributor

@figo figo commented Aug 25, 2019

a few changes included in this PR:

  1. allow customization of kubeadm image repository
  2. allow kubernets and cni rpm version convention been different from deb version convention
    then ansible/filter_plugins/kube.py no longer needed
  3. rename to kubernetes_source_type, the value either be pkg (rpm/deb) or http, which define where kubeadm, kubelet, kubectl comes from, the same goes to kubernetes_cni_source_type
  4. fix Makefile: remove the shell part completely, as user reported in certain linux distro, it is not working with certain make and bash version when bash run inside Make target.

Signed-off-by: Hui Luo [email protected]

cc @detiber @jiatongw

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 25, 2019
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 25, 2019
allow kubeadm image repo customization
and allow kubernetes rpm and deb versions follow different
convention

Signed-off-by: Hui Luo <[email protected]>
@figo
Copy link
Contributor Author

figo commented Aug 26, 2019

/assign @detiber
/assign @akutz

Copy link

@jiatongw jiatongw left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

@jiatongw: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@akutz
Copy link
Contributor

akutz commented Aug 27, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 27, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akutz, figo

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

@akutz
Copy link
Contributor

akutz commented Aug 27, 2019

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 27, 2019
Copy link
Member

@detiber detiber left a comment

Choose a reason for hiding this comment

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

lgtm outside of the one comment

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 27, 2019
cleanup the kubeadm config after been used.

Signed-off-by: Hui Luo <[email protected]>
@detiber
Copy link
Member

detiber commented Aug 27, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 27, 2019
@akutz
Copy link
Contributor

akutz commented Aug 27, 2019

/lgtm
/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 Aug 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit b6b9174 into kubernetes-sigs:master Aug 27, 2019
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. 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/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.

5 participants