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

Upstream rebase #14

Merged
merged 15 commits into from
Jan 30, 2019
Merged

Upstream rebase #14

merged 15 commits into from
Jan 30, 2019

Conversation

flaper87
Copy link

No description provided.

Christoph Glaubitz and others added 15 commits January 28, 2019 15:42
docker disabled iptables and ip-masq.
only deploy calico.
used hostname -s to avoid .novalocal confusion.
removed ssl cert host mount into manager container, because the manager
container already includes a sane set of certs. And on centos
/etc/ssl/certs only contains a symlink which was not mounted in. So TLS
to openstack api was broken with the host mount.
Tagged resouces networks, subnet and router with
`cluster-api-provider-openstack` and the cluster name in form of
`<namespace>/<name>`.
This moves the OS_CLOUD data to a ConfigMap and then references that in
the environment of the controller, instead of injecting OS_CLOUD
directly into the environment variables. This fixes kubernetes-sigs#161.
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
* improve generator readme

* add prerequisites section

* improve readme
…gs#192)

* Remove GetKubeConfig from the machine actuator

`GetKubeConfig` is only needed in the deployer, therefore we can do away
with the code we have in the machine actuator. This helps with issues kubernetes-sigs#174
and kubernetes-sigs#175

* Don't mount sshkeys on the manager's pod

We've removed the last use for the sshkeys secret/mount in the manager's
POD, which means we can now remove this code and stop mounting these
keys.

Fixes kubernetes-sigs#175

* Remove KeyPair related functions from the machine service

We're not managing keypairs from the actuator anymore. The functions
that used to manage keypairs have been removed in this commit.
There's no point for us to stick with alpha versions. Let's use the
master branch until there's a release candidate that we can pin to and
stick with.

Master doesn't necessarily mean using bleeding edge as we can still
control the updates and evaluate them case by case.
Current version of cluster-api contains issue fixed in upstream here:
kubernetes-sigs/cluster-api#698. That issue
prevents clusterctl bootstrap arguments from working.

Also this update brings kind bootstrapper which is nice.

Change-Id: I2ff60e2a6d2adb9a735a9bb9c0aed181cb6ce475
Options for bootstrap provisioner changed in clustercli. Adjust README
accordingly.

Change-Id: I2f7a078e09daf87f7a4f85827737b75f2d0a9c5f
)

When cloudsSecret is not specified in machine's provider config,
currently provider segfaults because CloudsSecret is nil and we try to
access Namespace field from it. Add a guard to ignore secret if it is
nil or name is empty.
base64 output can contain `/` which breaks sed as it considers `/` to be
end of command.

Also remove remnants of SSH key substitution in templates.
* move rbac from hard code to generate

use control-gen tool to
generate rbac/rbac_role*.yaml files instead of hard code them

Fixes kubernetes-sigs#155

* make crd file generated automatically

use
go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd
to create instead of using hard code
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 28, 2019
@tomassedovic
Copy link

/assign @tomassedovic

@tomassedovic
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flaper87, tomassedovic

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

@openshift-merge-robot openshift-merge-robot merged commit 581696a into openshift:master Jan 30, 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. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants