-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5547 from justinsb/etcd_manager_tests
Add test for etcd-manager output
- Loading branch information
Showing
10 changed files
with
480 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package etcdmanager | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "k8s.io/kops/pkg/assets" | ||
| "k8s.io/kops/pkg/model" | ||
| "k8s.io/kops/pkg/testutils" | ||
| "k8s.io/kops/upup/pkg/fi" | ||
| ) | ||
|
|
||
| func Test_RunEtcdManagerBuilder(t *testing.T) { | ||
| basedir := "tests/minimal" | ||
|
|
||
| context := &fi.ModelBuilderContext{ | ||
| Tasks: make(map[string]fi.Task), | ||
| } | ||
| kopsModelContext, err := LoadKopsModelContext(basedir) | ||
| if err != nil { | ||
| t.Fatalf("error loading model %q: %v", basedir, err) | ||
| return | ||
| } | ||
|
|
||
| builder := EtcdManagerBuilder{ | ||
| KopsModelContext: kopsModelContext, | ||
| AssetBuilder: assets.NewAssetBuilder(kopsModelContext.Cluster, ""), | ||
| } | ||
|
|
||
| if err := builder.Build(context); err != nil { | ||
| t.Fatalf("error from Build: %v", err) | ||
| return | ||
| } | ||
|
|
||
| testutils.ValidateTasks(t, basedir, context) | ||
| } | ||
|
|
||
| func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) { | ||
| spec, err := testutils.LoadModel(basedir) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if spec.Cluster == nil { | ||
| return nil, fmt.Errorf("no cluster found in %s", basedir) | ||
| } | ||
|
|
||
| if len(spec.InstanceGroups) == 0 { | ||
| return nil, fmt.Errorf("no instance groups found in %s", basedir) | ||
| } | ||
|
|
||
| kopsContext := &model.KopsModelContext{ | ||
| Cluster: spec.Cluster, | ||
| InstanceGroups: spec.InstanceGroups, | ||
| } | ||
|
|
||
| return kopsContext, nil | ||
| } |
85 changes: 85 additions & 0 deletions
85
pkg/model/components/etcdmanager/tests/minimal/cluster.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| apiVersion: kops/v1alpha2 | ||
| kind: Cluster | ||
| metadata: | ||
| creationTimestamp: "2016-12-10T22:42:27Z" | ||
| name: minimal.example.com | ||
| spec: | ||
| kubernetesApiAccess: | ||
| - 0.0.0.0/0 | ||
| channel: stable | ||
| cloudProvider: aws | ||
| configBase: memfs://clusters.example.com/minimal.example.com | ||
| etcdClusters: | ||
| - etcdMembers: | ||
| - instanceGroup: master-us-test-1a | ||
| name: us-test-1a | ||
| name: main | ||
| backups: | ||
| backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-main | ||
| manager: | ||
| image: kopeio/etcd-manager:latest | ||
| - etcdMembers: | ||
| - instanceGroup: master-us-test-1a | ||
| name: us-test-1a | ||
| name: events | ||
| backups: | ||
| backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events | ||
| manager: | ||
| image: kopeio/etcd-manager:latest | ||
| kubernetesVersion: v1.8.0 | ||
| masterInternalName: api.internal.minimal.example.com | ||
| masterPublicName: api.minimal.example.com | ||
| networkCIDR: 172.20.0.0/16 | ||
| networking: | ||
| kubenet: {} | ||
| nonMasqueradeCIDR: 100.64.0.0/10 | ||
| sshAccess: | ||
| - 0.0.0.0/0 | ||
| topology: | ||
| masters: public | ||
| nodes: public | ||
| subnets: | ||
| - cidr: 172.20.32.0/19 | ||
| name: us-test-1a | ||
| type: Public | ||
| zone: us-test-1a | ||
|
|
||
| --- | ||
|
|
||
| apiVersion: kops/v1alpha2 | ||
| kind: InstanceGroup | ||
| metadata: | ||
| creationTimestamp: "2016-12-10T22:42:28Z" | ||
| name: nodes | ||
| labels: | ||
| kops.k8s.io/cluster: minimal.example.com | ||
| spec: | ||
| associatePublicIp: true | ||
| image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21 | ||
| machineType: t2.medium | ||
| maxSize: 2 | ||
| minSize: 2 | ||
| role: Node | ||
| subnets: | ||
| - us-test-1a | ||
|
|
||
| --- | ||
|
|
||
| apiVersion: kops/v1alpha2 | ||
| kind: InstanceGroup | ||
| metadata: | ||
| creationTimestamp: "2016-12-10T22:42:28Z" | ||
| name: master-us-test-1a | ||
| labels: | ||
| kops.k8s.io/cluster: minimal.example.com | ||
| spec: | ||
| associatePublicIp: true | ||
| image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21 | ||
| machineType: m3.medium | ||
| maxSize: 1 | ||
| minSize: 1 | ||
| role: Master | ||
| subnets: | ||
| - us-test-1a | ||
|
|
||
|
|
Oops, something went wrong.