Merge pull request #29 from ManagedKube/kops-1.13

Updating kops to 1.13
ManagedKube · Sep 8, 2019 · 8ad96c8 · 8ad96c8
2 parents 0093f38 + a10451e
commit 8ad96c8
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 101 deletions.
diff --git a/clusters/aws/kops/clusters/dev-example/values.yaml b/clusters/aws/kops/clusters/dev-example/values.yaml
@@ -1,6 +1,6 @@
 kopsName: dev-example.us-east-1
 s3BucketName: kubernetes-ops-1234-kops-state-store
-kubernetesVersion: 1.11.7
+kubernetesVersion: 1.13.10
 dnsZone: k8s.local
 awsRegion: us-east-1
 vpc: vpc-id-from-the-terraform-output
@@ -50,17 +50,9 @@ kubernetesApiAccess:
 iam:
   allowContainerRegistry: true
 
-# etcd
-etcd:
-  version: 3.2.18
-
 networkCIDR: 10.10.0.0/16
 networkPortion: "10.10"
 
-docker:
-  overrides: false
-  bridgeIP: 172.26.0.1/16
-
 enableBastionGroup1: true
 enableThreatstackMasterGroup1: false
 

diff --git a/clusters/aws/kops/clusters/dev/values.yaml b/clusters/aws/kops/clusters/dev/values.yaml
@@ -1,6 +1,6 @@
 kopsName: dev.us-east-1
 s3BucketName: kubernetes-ops-1234-kops-state-store
-kubernetesVersion: 1.11.7
+kubernetesVersion: 1.13.10
 dnsZone: k8s.local
 awsRegion: us-east-1
 vpc: vpc-id-from-the-terraform-output
@@ -50,17 +50,9 @@ kubernetesApiAccess:
 iam:
   allowContainerRegistry: true
 
-# etcd
-etcd:
-  version: 3.2.18
-
 networkCIDR: 10.10.0.0/16
 networkPortion: "10.10"
 
-docker:
-  overrides: false
-  bridgeIP: 172.26.0.1/16
-
 enableBastionGroup1: true
 enableThreatstackMasterGroup1: false
 

diff --git a/clusters/aws/kops/clusters/prod/values.yaml b/clusters/aws/kops/clusters/prod/values.yaml
@@ -1,6 +1,6 @@
 kopsName: prod.us-east-1
 s3BucketName: kubernetes-ops-1234-kops-state-store
-kubernetesVersion: 1.11.7
+kubernetesVersion: 1.13.10
 dnsZone: k8s.local
 awsRegion: us-east-1
 vpc: vpc-id-from-the-terraform-output
@@ -50,17 +50,9 @@ kubernetesApiAccess:
 iam:
   allowContainerRegistry: true
 
-# etcd
-etcd:
-  version: 3.2.18
-
 networkCIDR: 10.13.0.0/16
 networkPortion: "10.13"
 
-docker:
-  overrides: false
-  bridgeIP: 172.26.0.1/16
-
 enableBastionGroup1: true
 enableThreatstackMasterGroup1: false
 

diff --git a/clusters/aws/kops/clusters/qa/values.yaml b/clusters/aws/kops/clusters/qa/values.yaml
@@ -1,6 +1,6 @@
 kopsName: qa.us-east-1
 s3BucketName: kubernetes-ops-1234-kops-state-store
-kubernetesVersion: 1.11.7
+kubernetesVersion: 1.13.10
 dnsZone: k8s.local
 awsRegion: us-east-1
 vpc: vpc-id-from-the-terraform-output
@@ -50,17 +50,9 @@ kubernetesApiAccess:
 iam:
   allowContainerRegistry: true
 
-# etcd
-etcd:
-  version: 3.2.18
-
 networkCIDR: 10.11.0.0/16
 networkPortion: "10.11"
 
-docker:
-  overrides: false
-  bridgeIP: 172.26.0.1/16
-
 enableBastionGroup1: true
 enableThreatstackMasterGroup1: false
 

diff --git a/clusters/aws/kops/clusters/staging/values.yaml b/clusters/aws/kops/clusters/staging/values.yaml
@@ -1,6 +1,6 @@
 kopsName: staging.us-east-1
 s3BucketName: kubernetes-ops-1234-kops-state-store
-kubernetesVersion: 1.11.7
+kubernetesVersion: 1.13.10
 dnsZone: k8s.local
 awsRegion: us-east-1
 vpc: vpc-id-from-the-terraform-output
@@ -50,17 +50,9 @@ kubernetesApiAccess:
 iam:
   allowContainerRegistry: true
 
-# etcd
-etcd:
-  version: 3.2.18
-
 networkCIDR: 10.12.0.0/16
 networkPortion: "10.12"
 
-docker:
-  overrides: false
-  bridgeIP: 172.26.0.1/16
-
 enableBastionGroup1: true
 enableThreatstackMasterGroup1: false
 

diff --git a/clusters/aws/kops/clusters/values.yaml b/clusters/aws/kops/clusters/values.yaml
@@ -0,0 +1,8 @@
+---
+# etcd
+etcd:
+  version: 3.3.10
+
+docker:
+  overrides: false
+  bridgeIP: 172.26.0.1/16