-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kubetest2 - Add manifest template support
I'm updating the test-e2e make target as I go to make the presubmit job use it but soon I'll work on how we'll actually configure and invoke kubetest2 from our variety of jobs
- Loading branch information
Showing
8 changed files
with
282 additions
and
11 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,76 @@ | ||
| /* | ||
| Copyright 2021 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 deployer | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "k8s.io/klog/v2" | ||
| "sigs.k8s.io/kubetest2/pkg/exec" | ||
| ) | ||
|
|
||
| // replace performs a `kops replace` followed by `kops update cluster --yes` | ||
| func (d *deployer) replace() error { | ||
| args := []string{ | ||
| d.KopsBinaryPath, "create", "secret", "sshpublickey", | ||
| "admin", | ||
| "-i", d.SSHPublicKeyPath, | ||
| "--name", d.ClusterName, | ||
| } | ||
| klog.Info(strings.Join(args, " ")) | ||
| cmd := exec.Command(args[0], args[1:]...) | ||
| cmd.SetEnv(d.env()...) | ||
|
|
||
| exec.InheritOutput(cmd) | ||
| err := cmd.Run() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| args = []string{ | ||
| d.KopsBinaryPath, "replace", | ||
| "--filename", d.manifestPath, | ||
| "--force", | ||
| "--name", d.ClusterName, | ||
| } | ||
| klog.Info(strings.Join(args, " ")) | ||
|
|
||
| cmd = exec.Command(args[0], args[1:]...) | ||
| cmd.SetEnv(d.env()...) | ||
|
|
||
| exec.InheritOutput(cmd) | ||
| err = cmd.Run() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| args = []string{ | ||
| d.KopsBinaryPath, "update", "cluster", "--yes", | ||
| "--name", d.ClusterName, | ||
| } | ||
| klog.Info(strings.Join(args, " ")) | ||
|
|
||
| cmd = exec.Command(args[0], args[1:]...) | ||
| cmd.SetEnv(d.env()...) | ||
|
|
||
| exec.InheritOutput(cmd) | ||
| err = cmd.Run() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } |
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,75 @@ | ||
| /* | ||
| Copyright 2021 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 deployer | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "path" | ||
| "strings" | ||
|
|
||
| "gopkg.in/yaml.v2" | ||
| "k8s.io/klog/v2" | ||
| "sigs.k8s.io/kubetest2/pkg/exec" | ||
| ) | ||
|
|
||
| // renderTemplate will render the manifest template with the provided values, | ||
| // setting the deployer's manifestPath | ||
| func (d *deployer) renderTemplate(values map[string]interface{}) error { | ||
| dir, err := ioutil.TempDir("", "kops-template") | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| valuesBytes, err := yaml.Marshal(values) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| valuesPath := path.Join(dir, "values.yaml") | ||
| ioutil.WriteFile(valuesPath, valuesBytes, 0644) | ||
|
|
||
| manifestPath := path.Join(dir, "manifest.yaml") | ||
| d.manifestPath = manifestPath | ||
|
|
||
| args := []string{ | ||
| d.KopsBinaryPath, "toolbox", "template", | ||
| "--template", d.TemplatePath, | ||
| "--output", manifestPath, | ||
| "--values", valuesPath, | ||
| } | ||
| klog.Info(strings.Join(args, " ")) | ||
|
|
||
| cmd := exec.Command(args[0], args[1:]...) | ||
| cmd.SetEnv(d.env()...) | ||
|
|
||
| exec.InheritOutput(cmd) | ||
| err = cmd.Run() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (d *deployer) templateValues(zones []string, publicIP string) map[string]interface{} { | ||
| return map[string]interface{}{ | ||
| "cloudProvider": d.CloudProvider, | ||
| "clusterName": d.ClusterName, | ||
| "kubernetesVersion": d.KubernetesVersion, | ||
| "publicIP": publicIP, | ||
| "stateStore": d.StateStore, | ||
| "zones": zones, | ||
| } | ||
| } |
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,79 @@ | ||
| {{$zone := zones[0]}} | ||
| apiVersion: kops.k8s.io/v1alpha2 | ||
| kind: Cluster | ||
| metadata: | ||
| name: {{.clusterName}} | ||
| spec: | ||
| kubernetesApiAccess: | ||
| - {{.publicIP}} | ||
| channel: stable | ||
| cloudProvider: {{.cloudProvider}} | ||
| configBase: "{{.stateStore}}/{{.clusterName}}" | ||
| etcdClusters: | ||
| - etcdMembers: | ||
| - instanceGroup: master-{{$zone}} | ||
| name: {{$zone}} | ||
| name: main | ||
| - etcdMembers: | ||
| - instanceGroup: master-{{$zone}} | ||
| name: {{$zone}} | ||
| name: events | ||
| iam: {} | ||
| kubelet: | ||
| anonymousAuth: false | ||
| kubernetesVersion: {{.kubernetesVersion}} | ||
| masterInternalName: api.internal.{{.clusterName}} | ||
| masterPublicName: api.{{.clusterName}} | ||
| networkCIDR: 172.20.0.0/16 | ||
| networking: | ||
| kubenet: {} | ||
| nodePortAccess: 0.0.0.0/0 | ||
| nonMasqueradeCIDR: 100.64.0.0/10 | ||
| sshAccess: | ||
| - {.publicIP} | ||
| sshKeyName: admin | ||
| topology: | ||
| masters: public | ||
| nodes: public | ||
| subnets: | ||
| - cidr: 172.20.32.0/19 | ||
| name: {{$zone}} | ||
| type: Public | ||
| zone: {{$zone}} | ||
|
|
||
| --- | ||
|
|
||
| apiVersion: kops.k8s.io/v1alpha2 | ||
| kind: InstanceGroup | ||
| metadata: | ||
| name: nodes-{{$zone}} | ||
| labels: | ||
| kops.k8s.io/cluster: {{.clusterName}} | ||
| spec: | ||
| associatePublicIp: true | ||
| image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20201112.1 | ||
| machineType: t3.medium | ||
| maxSize: 4 | ||
| minSize: 4 | ||
| role: Node | ||
| subnets: | ||
| - {{$zone}} | ||
|
|
||
| --- | ||
|
|
||
| apiVersion: kops.k8s.io/v1alpha2 | ||
| kind: InstanceGroup | ||
| metadata: | ||
| name: master-{{$zone}} | ||
| labels: | ||
| kops.k8s.io/cluster: {{.clusterName}} | ||
| spec: | ||
| associatePublicIp: true | ||
| image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20201112.1 | ||
| machineType: c5.large | ||
| maxSize: 1 | ||
| minSize: 1 | ||
| role: Master | ||
| subnets: | ||
| - {{$zone}} | ||
|
|