kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6296 from justinsb/gce_labels 

GCE terraform: support labels
This commit is contained in:
Kubernetes Prow Robot 2019-01-09 02:05:29 -08:00 committed by GitHub
parent 9b8aabc2a5 9494dfeb8c
commit 38076b3f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/integration/update_cluster/ha_gce/kubernetes.tf
View File

@ -26,6 +26,12 @@ resource "google_compute_disk" "d1-etcd-events-ha-gce-example-com" {
type = "pd-ssd" type = "pd-ssd"
size = 20 size = 20
zone = "us-test1-a" zone = "us-test1-a"
labels = {
k8s-io-cluster-name = "ha-gce-example-com"
k8s-io-etcd-events = "1-2f1-2c2-2c3"
k8s-io-role-master = "master"
}
} }
resource "google_compute_disk" "d1-etcd-main-ha-gce-example-com" { resource "google_compute_disk" "d1-etcd-main-ha-gce-example-com" {
@ -33,6 +39,12 @@ resource "google_compute_disk" "d1-etcd-main-ha-gce-example-com" {
type = "pd-ssd" type = "pd-ssd"
size = 20 size = 20
zone = "us-test1-a" zone = "us-test1-a"
labels = {
k8s-io-cluster-name = "ha-gce-example-com"
k8s-io-etcd-main = "1-2f1-2c2-2c3"
k8s-io-role-master = "master"
}
} }
resource "google_compute_disk" "d2-etcd-events-ha-gce-example-com" { resource "google_compute_disk" "d2-etcd-events-ha-gce-example-com" {
@ -40,6 +52,12 @@ resource "google_compute_disk" "d2-etcd-events-ha-gce-example-com" {
type = "pd-ssd" type = "pd-ssd"
size = 20 size = 20
zone = "us-test1-b" zone = "us-test1-b"
labels = {
k8s-io-cluster-name = "ha-gce-example-com"
k8s-io-etcd-events = "2-2f1-2c2-2c3"
k8s-io-role-master = "master"
}
} }
resource "google_compute_disk" "d2-etcd-main-ha-gce-example-com" { resource "google_compute_disk" "d2-etcd-main-ha-gce-example-com" {
@ -47,6 +65,12 @@ resource "google_compute_disk" "d2-etcd-main-ha-gce-example-com" {
type = "pd-ssd" type = "pd-ssd"
size = 20 size = 20
zone = "us-test1-b" zone = "us-test1-b"
labels = {
k8s-io-cluster-name = "ha-gce-example-com"
k8s-io-etcd-main = "2-2f1-2c2-2c3"
k8s-io-role-master = "master"
}
} }
resource "google_compute_disk" "d3-etcd-events-ha-gce-example-com" { resource "google_compute_disk" "d3-etcd-events-ha-gce-example-com" {
@ -54,6 +78,12 @@ resource "google_compute_disk" "d3-etcd-events-ha-gce-example-com" {
type = "pd-ssd" type = "pd-ssd"
size = 20 size = 20
zone = "us-test1-c" zone = "us-test1-c"
labels = {
k8s-io-cluster-name = "ha-gce-example-com"
k8s-io-etcd-events = "3-2f1-2c2-2c3"
k8s-io-role-master = "master"
}
} }
resource "google_compute_disk" "d3-etcd-main-ha-gce-example-com" { resource "google_compute_disk" "d3-etcd-main-ha-gce-example-com" {
@ -61,6 +91,12 @@ resource "google_compute_disk" "d3-etcd-main-ha-gce-example-com" {
type = "pd-ssd" type = "pd-ssd"
size = 20 size = 20
zone = "us-test1-c" zone = "us-test1-c"
labels = {
k8s-io-cluster-name = "ha-gce-example-com"
k8s-io-etcd-main = "3-2f1-2c2-2c3"
k8s-io-role-master = "master"
}
} }
resource "google_compute_firewall" "cidr-to-master-ha-gce-example-com" { resource "google_compute_firewall" "cidr-to-master-ha-gce-example-com" {

12
upup/pkg/fi/cloudup/gcetasks/disk.go
View File

@ -169,14 +169,26 @@ type terraformDisk struct {
VolumeType *string `json:"type"` VolumeType *string `json:"type"`
SizeGB *int64 `json:"size"` SizeGB *int64 `json:"size"`
Zone *string `json:"zone"` Zone *string `json:"zone"`
Labels map[string]string `json:"labels,omitempty"`
} }
func (_ *Disk) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Disk) error { func (_ *Disk) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Disk) error {
cloud := t.Cloud.(gce.GCECloud)
labels := make(map[string]string)
for k, v := range cloud.Labels() {
labels[k] = v
}
for k, v := range e.Labels {
labels[k] = v
}
tf := &terraformDisk{ tf := &terraformDisk{
Name: e.Name, Name: e.Name,
VolumeType: e.VolumeType, VolumeType: e.VolumeType,
SizeGB: e.SizeGB, SizeGB: e.SizeGB,
Zone: e.Zone, Zone: e.Zone,
Labels: labels,
} }
return t.RenderResource("google_compute_disk", *e.Name, tf) return t.RenderResource("google_compute_disk", *e.Name, tf)
} }