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

Use canal #123

Merged
merged 8 commits into from
Dec 18, 2018
Merged

Use canal #123

merged 8 commits into from
Dec 18, 2018

Conversation

alvaroaleman
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #122

Special notes for your reviewer:

Documentation:

Release note:

none

/assign @xrstf

@kubermatic-bot kubermatic-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Dec 17, 2018
@kubermatic-bot kubermatic-bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 17, 2018
xmudrii
xmudrii reviewed Dec 17, 2018
View reviewed changes
pkg/templates/canal/canal.go Outdated
func Configuration(cluster *config.Cluster) (string, error) {
tpl, err := template.New("base").Parse(canal)
if err != nil {
return "", fmt.Errorf("failed to parse calico config: %v", err)
Copy link
Member

Choose a reason for hiding this comment

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

Is calico here left as intended or it should be canal?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oups, will fix up

@xmudrii
Copy link
Member

xmudrii commented Dec 17, 2018

/lgtm

holding as not sure does it also approve when lgtm-ed
/hold

@kubermatic-bot kubermatic-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm Indicates that a PR is ready to be merged. labels Dec 17, 2018
@kubermatic-bot kubermatic-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 17, 2018
@alvaroaleman
Copy link
Contributor Author

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2018
@alvaroaleman
Copy link
Contributor Author

@xmudrii @xrstf PTAL

xrstf
xrstf reviewed Dec 17, 2018
View reviewed changes
pkg/installer/version/kube112/07-apply-cni.go Outdated

_, _, err := ctx.Runner.Run(`sudo kubectl create -f ./{{ .WORK_DIR }}/kube-flannel.yaml`, util.TemplateVariables{
ctx.Logger.Infoln("Applying canal CNI plugin…")
_, _, err := ctx.Runner.Run(`sudo kubectl apply -f ./{{ .WORK_DIR }}/canal.yaml`, util.TemplateVariables{
Copy link
Contributor

Choose a reason for hiding this comment

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

I did the error when I first started the migration from the ol' shellscript and now regret it. Please remove the ./ so we can, if we want, have {{ .WORK_DIR }} be an absolute path. I already replaced it in a bunch of other places.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated, PTAL

@alvaroaleman
Copy link
Contributor Author

@xrstf @xmudrii Can we merge this?

@xmudrii
Copy link
Member

xmudrii commented Dec 18, 2018

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2018
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xmudrii

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2018
@kubermatic-bot kubermatic-bot merged commit 97fbaf5 into master Dec 18, 2018
@alvaroaleman alvaroaleman deleted the use-canal branch December 18, 2018 21:15
@xmudrii xmudrii mentioned this pull request Mar 12, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xrstf xrstf xrstf left review comments

@xmudrii xmudrii xmudrii left review comments

@kron4eg kron4eg Awaiting requested review from kron4eg

Assignees

@xrstf xrstf

@xmudrii xmudrii

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. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replace flannel with canal to allow using NetworkPolicies
4 participants
@alvaroaleman @xmudrii @kubermatic-bot @xrstf