Skip to content

Commit 819fea2

Browse files
committed
Provider v1beta1
Signed-off-by: Roy Golan <[email protected]>
1 parent ceeac5f commit 819fea2

File tree

1,081 files changed

+388543
-262369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,081 files changed

+388543
-262369
lines changed

Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# See the License for the specific language governing permissions and
1111
# limitations under the License.
1212

13-
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
13+
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
1414

1515
ARG version
1616
ARG release
@@ -26,6 +26,8 @@ LABEL com.redhat.component="machine-api" \
2626
WORKDIR /go/cluster-api-provider-ovirt
2727
COPY . .
2828

29+
30+
RUN git --version
2931
RUN make build
3032

3133
FROM registry.access.redhat.com/ubi8/ubi-minimal

LICENSE

+12-197
Original file line numberDiff line numberDiff line change
@@ -1,201 +1,16 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
1+
Copyright oVirt Authors
42

5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
66

7-
1. Definitions.
7+
http://www.apache.org/licenses/LICENSE-2.0
88

9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
1114

12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
14-
15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright {yyyy} {name of copyright owner}
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.
15+
A copy of the Apache License, Version 2.0 is included with the program
16+
in the file ASL2.

Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ VERSION?=$(shell git describe --tags --always --match "v[0-9]*" | awk -F'-' '{pr
2121
RELEASE?=$(shell git describe --tags --always --match "v[0-9]*" | awk -F'-' '{if ($$2 != "") {print $$2 "." $$3} else {print 1}}')
2222
VERSION_RELEASE=$(VERSION)$(if $(RELEASE),-$(RELEASE))
2323

24+
CLUSTER_API ?= github.com/openshift/cluster-api
25+
2426
.PHONY: vendor
2527
vendor:
2628
go mod tidy
@@ -33,12 +35,12 @@ $(GOBIN):
3335

3436
work: $(GOBIN)
3537

36-
build: export BUILDAH_LAYERS=true
38+
#build: export BUILDAH_LAYERS=true
3739
build:
3840
CGO_ENABLED=0 GOOS=$(GOOS) go build \
3941
-ldflags $(LDFLAGS) \
4042
-o bin/manager \
41-
cmd/manager/main.go
43+
vendor/$(CLUSTER_API)/cmd/manager/main.go
4244
CGO_ENABLED=0 GOOS=$(GOOS) go build \
4345
-ldflags $(LDFLAGS) \
4446
-o bin/machine-controller-manager \
@@ -114,7 +116,7 @@ generate:
114116
DOCKERFILE=Dockerfile
115117
images:
116118
podman build \
117-
-t $(REGISTRY)/cluster-api-provider-ovirt:$(VERSION_RELEASE) \
119+
-t $(REGISTRY)/origin-ovirt-machine-controllers:$(VERSION_RELEASE) \
118120
--build-arg version=$(VERSION) \
119121
--build-arg release=$(RELEASE) \
120122
-f $(DOCKERFILE) \

README.md

+14-63
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,26 @@
1-
# Kubernetes cluster-api-provider-ovirt Project
1+
# cluster-api-provider-ovirt
22

33
https://github.com/oVirt/cluster-api-provider-ovirt
44

5-
# UNDER HEAVY DEVELOPMENT
5+
Implementation of the oVirt provider for the [cluster-api project] version `v1beta` \
6+
using openshift/cluster-api-provider api, which implements the machine actuator.
67

7-
Implementation of the oVirt provider for the [cluster-api project](https://github.com/kubernetes-sigs/cluster-api).
8+
# Development
89

10+
Fast development cycle is to build the binarties, `manager` and `machine-controller-manager` \
11+
and run those against a running cluster kubeconfig.
912

10-
## Community, discussion, contribution, and support
11-
12-
Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/).
13-
14-
You can reach the maintainers of this project at:
15-
16-
- [#cluster-api on Kubernetes Slack](http://kubernetes.slack.com/messages/cluster-api)
17-
- [SIG-Cluster-Lifecycle Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)/
18-
19-
### Code of conduct
20-
21-
Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
22-
23-
## Getting Started
24-
25-
### Prerequisites
26-
27-
1. Install `kubectl` (see [here](http://kubernetes.io/docs/user-guide/prereqs/)).
28-
2. Install [minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/), version 0.30.0 or greater.
29-
3. Install a [driver](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md) for minikube. For Linux, we recommend kvm2. For MacOS, we recommend VirtualBox.
30-
4. An appropriately configured [Go development environment](https://golang.org/doc/install)
31-
5. Build the `clusterctl` tool
32-
33-
34-
35-
### Cluster Creation
36-
37-
38-
```bash
39-
./clusterctl create cluster --help
13+
## build
4014
```
41-
42-
43-
44-
### Interacting with your cluster
45-
46-
Once you have created a cluster, you can interact with the cluster and machine
47-
resources using kubectl:
48-
49-
```bash
50-
kubectl --kubeconfig=kubeconfig get clusters
51-
kubectl --kubeconfig=kubeconfig get machines
52-
kubectl --kubeconfig=kubeconfig get machines -o yaml
15+
make build
5316
```
5417

55-
### Cluster Deletion
56-
57-
1. Delete all of the node Machines in the cluster. Make sure to wait for the
58-
corresponding Nodes to be deleted before moving onto the next step. After this
59-
step, the master node will be the only remaining node.
60-
61-
```bash
62-
kubectl --kubeconfig=kubeconfig delete machines -l set=node
63-
kubectl --kubeconfig=kubeconfig get nodes
64-
```
18+
## run the components locally
6519

66-
2. Delete the master machine.
67-
```bash
68-
kubectl --kubeconfig=kubeconfig delete machines -l set=master
69-
```
20+
```console
21+
$ export KUBECONFIG=path/to/kubecofig
7022

71-
3. Delete the ssh keypair that were created for your cluster machine.
23+
$ bin/manager &
7224

73-
```bash
74-
rm -rf $HOME/.ssh/ovirt_tmp*
75-
```
25+
$ bin/machine-controller-manager --namespace openshit-machine-api --metrics-addr=:8888 &
26+
```

0 commit comments

Comments
 (0)