Skip to content
Merged

Crds #100

Show file tree
Hide file tree
Changes from all commits
Commits
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
276 changes: 248 additions & 28 deletions Gopkg.lock

Large diffs are not rendered by default.

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: '{"clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerManagerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIServer": "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.6", "Etcd": "quay.io/coreos/etcd:latest"}'
images.json: '{"clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "registry.svc.ci.openshift.org/openshift/libvirt-machine-controllers:crd", "clusterAPIControllerLibvirt": "registry.svc.ci.openshift.org/openshift/libvirt-machine-controllers:crd"}'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here as well:

"clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
"clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"

Copy link
Member Author

@enxebre enxebre Oct 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! fyi that does not have any effect, libvirt is not being tested here. We need to add framework like testing in this repo. After merging this we need to wait for it to be part of the payload.
Then we can get the aws crd pr green.
And then we need to put the real images name here back to 4.0.0

92 changes: 92 additions & 0 deletions owned-manifests/cluster.crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
labels:
controller-tools.k8s.io: "1.0"
name: clusters.cluster.k8s.io
spec:
group: cluster.k8s.io
names:
kind: Cluster
plural: clusters
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
clusterNetwork:
properties:
pods:
properties:
cidrBlocks:
items:
type: string
type: array
required:
- cidrBlocks
type: object
serviceDomain:
type: string
services:
properties:
cidrBlocks:
items:
type: string
type: array
required:
- cidrBlocks
type: object
required:
- services
- pods
- serviceDomain
type: object
providerConfig:
properties:
value:
type: object
valueFrom:
type: object
type: object
required:
- clusterNetwork
type: object
status:
properties:
apiEndpoints:
items:
properties:
host:
type: string
port:
format: int64
type: integer
required:
- host
- port
type: object
type: array
errorMessage:
type: string
errorReason:
type: string
providerStatus:
type: object
type: object
version: v1alpha1
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
14 changes: 0 additions & 14 deletions owned-manifests/clusterapi-apiserver-role-binding.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions owned-manifests/clusterapi-apiserver-svc.yaml

This file was deleted.

114 changes: 0 additions & 114 deletions owned-manifests/clusterapi-apiserver.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions owned-manifests/clusterapi-apiservice.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions owned-manifests/clusterapi-controller-cluster-role-binding.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions owned-manifests/clusterapi-controller-cluster-role.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: "clusterapi:apiserver-auth-delegator"
name: cluster-api-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:auth-delegator
name: cluster-api-manager-role
subjects:
- apiGroup: ""
kind: ServiceAccount
- kind: ServiceAccount
name: default
namespace: {{ .TargetNamespace }}
Loading