Skip to content

Mvp #17

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

Merged
enxebre merged 7 commits into from
Aug 17, 2018
Merged

Mvp #17

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa06953
vendor cluster api
enxebre Aug 17, 2018
67fd876
add examples
enxebre Aug 17, 2018
8309c02
add machines folder
enxebre Aug 17, 2018
aeea16a
update manifests
enxebre Aug 17, 2018
8d2e9fe
add config params
enxebre Aug 17, 2018
ea1e046
add machineSet deployment hack
enxebre Aug 17, 2018
f0e4fa5
add machines folder to dockerfile
enxebre Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
294 changes: 292 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
name = "k8s.io/apimachinery"
version = "kubernetes-1.9.0"

[[override]]
name = "k8s.io/api"
version= "kubernetes-1.9.0"
[[override]]
name = "k8s.io/client-go"
version= "v6.0.0"
[[override]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.9.0"

@ingvagabund ingvagabund Aug 13, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We should fix the sigs.k8s.io/cluster-api to the latest release once there is reasonable one available. Meantime, we should fix the revision. The latest one is fbc85d97affbf5c9ad97054c66b23ad2bc0ca097. We want to be as close to the upstream as possible even though we use only the machine types (or more than just those types?). Upstream docs [1] says we can use the revision keyword:

[[constraint]]
  # Required: the root import path of the project being constrained.
  name = "github.com/user/project"
  # Recommended: the version constraint to enforce for the project.
  # Note that only one of "branch", "version" or "revision" can be specified.
  version = "1.0.0"
  branch = "master"
  revision = "abc123"

[1] https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md

[prune]
go-tests = true
unused-packages = true
46 changes: 46 additions & 0 deletions examples/cluster-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
apiVersion: "cluster.k8s.io/v1alpha1"
kind: Cluster
metadata:
name: test
namespace: test
spec:
clusterNetwork:
services:
cidrBlocks:
- "10.0.0.1/24"
pods:
cidrBlocks:
- "10.0.0.2/24"
serviceDomain: example.com
providerConfig:
value:
apiVersion: awsproviderconfig/v1alpha1
kind: AWSClusterProviderConfig
clusterId: meh.tectonic.kuwit.rocks
clusterVersionRef:
namespace: test
name: test
hardware:
aws:
# accountSecret:
# name: test-aws-creds
sshSecret:
name: tectonic
sshUser: centos
sslSecret:
name: test-certs
region: eu-west-1
keyPairName: tectonic
defaultHardwareSpec:
aws:
instanceType: m4.large
machineSets:
- nodeType: Master
size: 1
- shortName: infra
nodeType: Compute
infra: true
size: 1
- shortName: compute
nodeType: Compute
size: 1
41 changes: 41 additions & 0 deletions examples/machine-set-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
apiVersion: cluster.k8s.io/v1alpha1
kind: MachineSet
metadata:
name: extra-worker-machinset
namespace: test
labels:
machineapioperator.openshift.io/cluster: test
spec:
replicas: 5
selector:
matchLabels:
machineapioperator.openshift.io/machineset: extra-worker-machinset
machineapioperator.openshift.io/cluster: test
template:
metadata:
labels:
machineapioperator.openshift.io/machineset: extra-worker-machinset
machineapioperator.openshift.io/cluster: test
spec:
providerConfig:
value:
apiVersion: awsproviderconfig/v1alpha1
kind: AWSMachineProviderConfig
clusterId: meh.tectonic.kuwit.rocks
clusterHardware:
aws:
keyPairName: tectonic
region: eu-west-1
hardware:
aws:
instanceType: m4.large
infra: false
vmImage:
# CoreOS-beta-1828.3.0-hvm
awsImage: ami-0518e1ac70d8a3389
versions:
kubelet: 0.0.0
controlPlane: 0.0.0
roles:
- Master

30 changes: 30 additions & 0 deletions examples/machine-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
apiVersion: "cluster.k8s.io/v1alpha1"
kind: Machine
metadata:
name: another-machine-api-worker
namespace: test
generateName: vs-worker-
labels:
set: worker
spec:
providerConfig:
value:
apiVersion: awsproviderconfig/v1alpha1
kind: AWSMachineProviderConfig
clusterId: meh.tectonic.kuwit.rocks
clusterHardware:
aws:
keyPairName: tectonic
region: eu-west-1
hardware:
aws:
instanceType: m4.large
infra: false
vmImage:
# CoreOS-beta-1828.3.0-hvm
awsImage: ami-0518e1ac70d8a3389
versions:
kubelet: 0.0.0
controlPlane: 0.0.0
roles:
- Master
39 changes: 39 additions & 0 deletions machines/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
apiVersion: "cluster.k8s.io/v1alpha1"
kind: Cluster
metadata:
name: test

@enxebre enxebre Aug 17, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

name and namespaces need to be consolidated as part of CLOUD-80

namespace: test
spec:
clusterNetwork:
services:
cidrBlocks:
- "10.0.0.1/24"
pods:
cidrBlocks:
- "10.0.0.2/24"
serviceDomain: example.com
providerConfig:
value:
apiVersion: awsproviderconfig/v1alpha1
kind: AWSClusterProviderConfig
clusterId: {{.VpcName}}
clusterVersionRef:
namespace: test
name: test
hardware:
aws:
region: {{.Region}}
keyPairName: {{.SshKey}}
defaultHardwareSpec:
aws:
instanceType: m4.large
machineSets:
- nodeType: Master
size: 1
- shortName: infra
nodeType: Compute
infra: true
size: 1
- shortName: compute
nodeType: Compute
size: 1
40 changes: 40 additions & 0 deletions machines/machine-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
apiVersion: cluster.k8s.io/v1alpha1
kind: MachineSet
metadata:
name: worker
namespace: test
labels:
machineapioperator.openshift.io/cluster: test
spec:
replicas: 3
selector:
matchLabels:
machineapioperator.openshift.io/machineset: worker
machineapioperator.openshift.io/cluster: test
template:
metadata:
labels:
machineapioperator.openshift.io/machineset: worker
machineapioperator.openshift.io/cluster: test
spec:
providerConfig:
value:
apiVersion: awsproviderconfig/v1alpha1
kind: AWSMachineProviderConfig
clusterId: {{.VpcName}}
clusterHardware:
aws:
keyPairName: {{.SshKey}}
region: {{.Region}}
hardware:
aws:
instanceType: m4.large
infra: false
vmImage:
awsImage: {{.Image}}
versions:
kubelet: 0.0.0
controlPlane: 0.0.0
roles:
- Master

13 changes: 13 additions & 0 deletions vendor/bitbucket.org/ww/goautoneg/Makefile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions vendor/bitbucket.org/ww/goautoneg/README.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading