Merge pull request #9250 from mikesplain/1.18_channels

Update channels for 1.18
kubernetes · Jun 2, 2020 · 85c4e96 · 85c4e96
2 parents 6515093 + a0c73d3
commit 85c4e96
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/channels/alpha b/channels/alpha
@@ -55,6 +55,9 @@ spec:
     networking:
       kubenet: {}
   kubernetesVersions:
+  - range: ">=1.18.0-alpha.1"
+    recommendedVersion: 1.18.3
+    requiredVersion: 1.18.0
   - range: ">=1.17.0"
     recommendedVersion: 1.17.6
     requiredVersion: 1.17.0
@@ -80,6 +83,10 @@ spec:
     recommendedVersion: 1.11.10
     requiredVersion: 1.11.10
   kopsVersions:
+  - range: ">=1.18.0-alpha.1"
+    #recommendedVersion: "1.18.0-beta.1"
+    #requiredVersion: 1.18.0
+    kubernetesVersion: 1.18.3
   - range: ">=1.17.0-alpha.1"
     #recommendedVersion: "1.17.0"
     #requiredVersion: 1.17.0

diff --git a/channels/stable b/channels/stable
@@ -55,6 +55,9 @@ spec:
     networking:
       kubenet: {}
   kubernetesVersions:
+  - range: ">=1.18.0-alpha.1"
+    recommendedVersion: 1.18.3
+    requiredVersion: 1.18.0
   - range: ">=1.17.0"
     recommendedVersion: 1.17.6
     requiredVersion: 1.17.0
@@ -80,6 +83,10 @@ spec:
     recommendedVersion: 1.11.10
     requiredVersion: 1.11.10
   kopsVersions:
+  - range: ">=1.18.0-alpha.1"
+    #recommendedVersion: "1.18.0-beta.1"
+    #requiredVersion: 1.18.0
+    kubernetesVersion: 1.18.3
   - range: ">=1.17.0-alpha.1"
     #recommendedVersion: "1.17.0"
     #requiredVersion: 1.17.0