Skip to content

Commit 73beb91

Browse files
committed
update expected Kubernetes versions to 1.10.11+, 1.11.5+, 1.12.3+
1 parent 69c5346 commit 73beb91

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

operator/src/main/java/oracle/kubernetes/operator/helpers/HealthCheckHelper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ public final class HealthCheckHelper {
6565
// default namespace or svc account name
6666
private static final String DEFAULT_NAMESPACE = "default";
6767

68-
private static final String MINIMUM_K8S_VERSION = "v1.7.5";
69-
7068
static {
7169
// CRUD resources
7270
namespaceAccessChecks.put(AuthorizationProxy.Resource.PODS, crudOperations);

operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/** Major and minor version of Kubernetes API Server */
1111
public class KubernetesVersion {
1212
static KubernetesVersion UNREADABLE = new KubernetesVersion(0, 0);
13-
private static final String[] MINIMUM_K8S_VERSIONS = {"1.7.5"};
13+
private static final String[] MINIMUM_K8S_VERSIONS = {"1.10.11", "1.11.5", "1.12.3"};
1414

1515
private final int major;
1616
private final int minor;

operator/src/test/java/oracle/kubernetes/operator/helpers/VersionCheckTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,14 @@ public static Collection<Object[]> data() {
8484
{VERSION_TEST, "0", "", "", returnsVersion(0, 0), ignoring(K8S_VERSION_TOO_LOW)},
8585
{LOG_MSG_TEST, "0", "", "", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()},
8686
{LOG_MSG_TEST, "1", "6+", "", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()},
87-
{LOG_MSG_TEST, "1", "7", "1+coreos.0", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()},
88-
{LOG_MSG_TEST, "1", "7", "5+coreos.0", containsInfo(K8S_VERSION_CHECK), noIgnores()},
89-
{VERSION_TEST, "1", "8", "3", returnsVersion(1, 8), ignoring(K8S_VERSION_CHECK)},
90-
{LOG_MSG_TEST, "1", "8", "3", containsInfo(K8S_VERSION_CHECK), noIgnores()},
87+
{LOG_MSG_TEST, "1", "10", "1+cor.0", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()},
88+
{LOG_MSG_TEST, "1", "10", "11", containsInfo(K8S_VERSION_CHECK), noIgnores()},
89+
{LOG_MSG_TEST, "1", "11", "4", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()},
90+
{LOG_MSG_TEST, "1", "11", "6", containsInfo(K8S_VERSION_CHECK), noIgnores()},
91+
{LOG_MSG_TEST, "1", "12", "2", containsWarning(K8S_VERSION_TOO_LOW), noIgnores()},
92+
{LOG_MSG_TEST, "1", "12", "3", containsInfo(K8S_VERSION_CHECK), noIgnores()},
93+
{VERSION_TEST, "1", "13", "3", returnsVersion(1, 13), ignoring(K8S_VERSION_CHECK)},
94+
{LOG_MSG_TEST, "1", "13", "3", containsInfo(K8S_VERSION_CHECK), noIgnores()},
9195
{VERSION_TEST, "2", "7", "", returnsVersion(2, 7), ignoring(K8S_VERSION_CHECK)},
9296
{LOG_MSG_TEST, "2", "", "", containsInfo(K8S_VERSION_CHECK), noIgnores()},
9397
});

0 commit comments

Comments
 (0)