Refactored Calico and updated playbooks to reflect self-hosted Calico installs only

[mgleung]

• Moved the calico role to calico_node
• Removed outdated commands in the calico_node (formerly calico) role
• Moved the calico_master role to calico
• Updated openshift.master.sdn_cluster_network_cidr usage to openshift_cluster_network_cidr
• Removed node selectors which were used for upgrading Calico running as a systemd service to a container

These changes follow the changes made in #9435 as well as add the new changes with calico_node.

[papr-bot]

Can one of the admins verify this patch?
I understand the following commands:

• bot, add author to whitelist
• bot, test pull request
• bot, test pull request once

[vrutkovs]

/ok-to-test

[vrutkovs]

proxy-and-dns fails to start and crashes:

$ oc logs -f proxy-and-dns-m8b4b -n kube-proxy-and-dns
User "sa" set.
Context "default/ip-172-18-0-178-ec2-internal:8443/system:admin" modified.
Command "start" is deprecated, This command will be replaced by the hypershift and hyperkube binaries for starting individual components.
Error: unknown flag: --disable
Available Commands:
  etcd        Launch etcd server
  master      Launch a master
Use "openshift <command> --help" for more information about a given command

[vrutkovs]

Seems openshift start network was deprecated and no longer present in 4.0 builds. @danwinship what's the new replacement for this command?

[danwinship]

@vrutkovs for now, if you just want proxy+dns, I believe openshift start network works. I'm not sure if that's going to change again before 4.0.

[danwinship]

er, except that it doesn't, which is what you just said. um...

[danwinship]

@vrutkovs For OpenShift SDN, the stuff that used to be openshift start network is now in a separate openshift-sdn binary. I'm not sure if you're supposed to use that binary to get proxy/dns for non-openshift-sdn plugins as well, though it probably will work as long as you have networkPlugin set appropriately (to a non-OpenShift plugin name) in node-config.yaml.

I think long term, the plan is that you should just be using upstream kube-proxy and DNS. I think?

[vrutkovs]

Right, that doesn't seem to be related to this PR, however it breaks non-openshift plugins.

I'll check if this also happens in 3.11.

UPD. It doesn't affect 3.11, so I guess we're fine with this change - and sort out 4.0 things separately

[vrutkovs]

/lgtm

[vrutkovs]

/cherrypick release-3.11

[openshift-cherrypick-robot]

@vrutkovs: once the present PR merges, I will cherry-pick it on top of release-3.11 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-3.11

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.

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgleung, vrutkovs

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:

• OWNERS [vrutkovs]

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

[openshift-cherrypick-robot]

@vrutkovs: #10226 failed to apply on top of branch "release-3.11":

error: mode change for roles/calico_master/templates/calico-etcd.yml.j2, which is not in current HEAD
error: could not build fake ancestor
Patch failed at 0001 Refactored Calico and updated playbooks to reflect self-hosted Calico installs only

Details

In response to this:

/cherrypick release-3.11

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.