Skip to content

Commit d8d8e28

Browse files
Merge pull request openshift#208 from mgugino-upstream-stage/update-readme
Update README.md
2 parents 3462b4f + a26eff0 commit d8d8e28

File tree

8 files changed

+23
-29
lines changed

8 files changed

+23
-29
lines changed

Gopkg.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
# Kubernetes cluster-api-provider-aws Project
1+
# OpenShift cluster-api-provider-aws
22

3-
This repository hosts an implementation of a provider for AWS for the [cluster-api project](https://sigs.k8s.io/cluster-api).
3+
This repository hosts an implementation of a provider for AWS for the
4+
OpenShift [machine-api](https://github.com/openshift/cluster-api).
45

5-
Note: The additionals PRs are applied on top of vendored `https://sigs.k8s.io/cluster-api`:
6-
- [https://github.com/kubernetes-sigs/cluster-api/pull/512](https://github.com/kubernetes-sigs/cluster-api/pull/512)
7-
- [https://github.com/kubernetes-sigs/cluster-api/pull/513](https://github.com/kubernetes-sigs/cluster-api/pull/513)
8-
9-
## Community, discussion, contribution, and support
10-
11-
Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/).
12-
13-
You can reach the maintainers of this project at:
14-
15-
- [#cluster-api on Kubernetes Slack](http://slack.k8s.io/messages/cluster-api)
16-
- [SIG-Cluster-Lifecycle Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)
17-
18-
### Code of conduct
19-
20-
Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
6+
This provider runs as a machine-controller deployed by the
7+
[machine-api-operator](https://github.com/openshift/machine-api-operator)
218

229
### How to build the images in the RH infrastructure
2310
The Dockerfiles use `as builder` in the `FROM` instruction which is not currently supported
@@ -124,3 +111,10 @@ Note: this info is RH only, it needs to be backported every time the `README.md`
124111
```sh
125112
$ kubectl apply -f examples/machine-set.yaml --validate=false
126113
```
114+
115+
# Upstream Implementation
116+
Other branches of this repository may choose to track the upstream
117+
Kubernetes [Cluster-API AWS provider](https://github.com/kubernetes-sigs/cluster-api-provider-aws/)
118+
119+
In the future, we may align the master branch with the upstream project as it
120+
stabilizes within the community.

vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/cluster-api-actuator-pkg/hack/ci-integration.sh

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/autoscaler/autoscaler.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/infra/infra.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/utils.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)