@@ -38,7 +38,19 @@ resources:
38
38
- type: compute.v1.network
39
39
name: {{ env['deployment'] }}-network
40
40
properties:
41
- autoCreateSubnetworks: true
41
+ autoCreateSubnetworks: false
42
+ - type: compute.v1.subnetworks
43
+ name: {{ env['deployment'] }}-us-central1
44
+ properties:
45
+ network: $(ref.{{ env['deployment'] }}-network.selfLink)
46
+ region: us-central1
47
+ ipCidrRange: 10.128.0.0/20
48
+ - type: compute.v1.subnetworks
49
+ name: {{ env['deployment'] }}-us-east4
50
+ properties:
51
+ network: $(ref.{{ env['deployment'] }}-network.selfLink)
52
+ region: us-east4
53
+ ipCidrRange: 10.132.0.0/20
42
54
- type: compute.v1.route
43
55
name: {{ env["deployment"] }}-default-route
44
56
properties:
@@ -51,7 +63,7 @@ resources:
51
63
properties:
52
64
location: us-central1-f
53
65
network: {{ env['deployment'] }}-network
54
- subnetwork: {{ env['deployment'] }}-network
66
+ subnetwork: {{ env['deployment'] }}-us-central1
55
67
purpose: workloads
56
68
apiVersion: v1beta1
57
69
kubernetesVersion: "1.10.4"
@@ -60,32 +72,32 @@ resources:
60
72
sockShop: "installed"
61
73
metadata:
62
74
dependsOn:
63
- - {{ env['deployment'] }}-network
75
+ - {{ env['deployment'] }}-us-central1
64
76
- name: east
65
77
type: cluster.jinja
66
78
properties:
67
79
location: us-east4-b
68
80
network: {{ env['deployment'] }}-network
69
- subnetwork: {{ env['deployment'] }}-network
81
+ subnetwork: {{ env['deployment'] }}-us-east4
70
82
purpose: workloads
71
83
apiVersion: v1beta1
72
84
kubernetesVersion: "1.10.4"
73
85
monitoringService: monitoring.googleapis.com/kubernetes
74
86
loggingService: logging.googleapis.com/kubernetes
75
87
metadata:
76
88
dependsOn:
77
- - {{ env['deployment'] }}-network
89
+ - {{ env['deployment'] }}-us-east4
78
90
- name: spinnaker
79
91
type: cluster.jinja
80
92
properties:
81
93
network: {{ env['deployment'] }}-network
82
- subnetwork: {{ env['deployment'] }}-network
83
- location : us-central1-f
94
+ subnetwork: {{ env['deployment'] }}-us-central1
95
+ zone : us-central1-f
84
96
purpose: spinnaker
85
97
kubernetesVersion: "1.10.4"
86
98
metadata:
87
99
dependsOn:
88
- - {{ env['deployment'] }}-network
100
+ - {{ env['deployment'] }}-us-central1
89
101
- type: compute.v1.firewall
90
102
name: {{ env['deployment'] }}-student-ssh
91
103
properties:
@@ -103,13 +115,14 @@ resources:
103
115
metadata:
104
116
dependsOn:
105
117
- iam
106
- - {{ env['deployment'] }}-network
118
+ - {{ env['deployment'] }}-us-central1
107
119
- east
108
120
- central
109
121
- spinnaker
110
122
properties:
111
123
zone: us-central1-f
112
124
network: $(ref.{{ env['deployment'] }}-network.selfLink)
125
+ subnetwork: $(ref.{{ env['deployment'] }}-us-central1.selfLink)
113
126
- name: student-vm-waiter
114
127
type: waiter.jinja
115
128
properties:
0 commit comments