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

Drop cluster.k8s.io #195

Closed
wants to merge 2 commits into from
+38 −653
Closed

Drop cluster.k8s.io #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15b6f5
Drop cluster.k8s.io CRDs and controllers
enxebre Feb 4, 2019
4773449
Update operator tests to run against machine.openshift.io
enxebre Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion install/0000_50_machine-api-operator_01_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: machine-api-operator-images
namespace: openshift-cluster-api
data:
images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134", "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134", "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"}'
images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}'
6 changes: 3 additions & 3 deletions install/0000_50_machine-api-operator_02_machine.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: machines.cluster.k8s.io
name: machines.machine.openshift.io
spec:
additionalPrinterColumns:
- JSONPath: .status.providerStatus.instanceId
Expand All @@ -30,7 +30,7 @@ spec:
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: cluster.k8s.io
group: machine.openshift.io
names:
kind: Machine
plural: machines
Expand Down Expand Up @@ -220,7 +220,7 @@ spec:
- kubelet
type: object
type: object
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
6 changes: 3 additions & 3 deletions install/0000_50_machine-api-operator_03_machineset.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: machinesets.cluster.k8s.io
name: machinesets.machine.openshift.io
spec:
group: cluster.k8s.io
group: machine.openshift.io
names:
kind: MachineSet
plural: machinesets
Expand Down Expand Up @@ -183,7 +183,7 @@ spec:
required:
- replicas
type: object
version: v1alpha1
version: v1beta1
additionalPrinterColumns:
- JSONPath: .spec.replicas
description: Desired Replicas
Expand Down
6 changes: 3 additions & 3 deletions install/0000_50_machine-api-operator_04_machinedeployment.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: machinedeployments.cluster.k8s.io
name: machinedeployments.machine.openshift.io
spec:
group: cluster.k8s.io
group: machine.openshift.io
names:
kind: MachineDeployment
plural: machinedeployments
Expand Down Expand Up @@ -230,7 +230,7 @@ spec:
format: int32
type: integer
type: object
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
6 changes: 3 additions & 3 deletions install/0000_50_machine-api-operator_05_cluster.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: CustomResourceDefinition
metadata:
labels:
controller-tools.k8s.io: "1.0"
name: clusters.cluster.k8s.io
name: clusters.machine.openshift.io
spec:
group: cluster.k8s.io
group: machine.openshift.io
names:
kind: Cluster
plural: clusters
Expand Down Expand Up @@ -88,7 +88,7 @@ spec:
providerStatus:
type: object
type: object
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
6 changes: 3 additions & 3 deletions install/0000_50_machine-api-operator_06_machineclass.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: machineclasses.cluster.k8s.io
name: machineclasses.machine.openshift.io
spec:
group: cluster.k8s.io
group: machine.openshift.io
names:
kind: MachineClass
plural: machineclasses
Expand All @@ -31,7 +31,7 @@ spec:
type: object
required:
- providerSpec
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
120 changes: 0 additions & 120 deletions install/0000_50_machine-api-operator_08_machine.crd.yaml
View file
Open in desktop

This file was deleted.

0 ...0000_50_machine-api-operator_13_rbac.yaml → ...0000_50_machine-api-operator_08_rbac.yaml
View file
Open in desktop
File renamed without changes.
0 ...0_machine-api-operator_14_deployment.yaml → ...0_machine-api-operator_09_deployment.yaml
View file
Open in desktop
File renamed without changes.
131 changes: 0 additions & 131 deletions install/0000_50_machine-api-operator_09_machineset.crd.yaml
View file
Open in desktop

This file was deleted.

Loading