Merge pull request #8799 from johngmyers/deprecate-1.10

Deprecate support for Kubernetes 1.10
kubernetes · Mar 27, 2020 · 7698323 · 7698323
2 parents 8df55b8 + 758f801
commit 7698323
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/releases/1.18-NOTES.md b/docs/releases/1.18-NOTES.md
@@ -74,7 +74,7 @@
 
 # Deprecations
 
-* Support for Kubernetes version 1.10 is deprecated and will be removed in kops 1.19.
+* Support for Kubernetes versions 1.9 and 1.10 are deprecated and will be removed in kops 1.19.
 
 # Full change list since 1.17.0 release
 

diff --git a/permalinks/upgrade_k8s.md b/permalinks/upgrade_k8s.md
@@ -6,7 +6,7 @@ Kops will drop support for Kubernetes versions as follows:
 | kops version | Drops support for Kubernetes version |
 |--------------|--------------------------------------|
 | 1.18         | 1.8 and below                        |
-| 1.19         | 1.9                                  |
+| 1.19         | 1.9 and 1.10                         |
 
 
 You are running a version of kubernetes that we recommend upgrading.

diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go
@@ -94,7 +94,7 @@ var (
 	// OldestSupportedKubernetesVersion is the oldest kubernetes version that is supported in Kops
 	OldestSupportedKubernetesVersion = "1.9.0"
 	// OldestRecommendedKubernetesVersion is the oldest kubernetes version that is not deprecated in Kops
-	OldestRecommendedKubernetesVersion = "1.10.0"
+	OldestRecommendedKubernetesVersion = "1.11.0"
 )
 
 type ApplyClusterCmd struct {