From 8ad7842ed1ccac04945f007ccf87a2ba7b30ed52 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 12 Mar 2019 19:42:14 +0530 Subject: [PATCH] Fix #1570: change API_APPS_VERSION to apps/v1 Change API_APPS_VERSION to apps/v1 and move deployment fragment creation with apps/v1 apiVersion rather than extensions --- .../maven/core/util/kubernetes/KubernetesResourceUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/io/fabric8/maven/core/util/kubernetes/KubernetesResourceUtil.java b/core/src/main/java/io/fabric8/maven/core/util/kubernetes/KubernetesResourceUtil.java index 442b7ab07f..7393d7dacd 100644 --- a/core/src/main/java/io/fabric8/maven/core/util/kubernetes/KubernetesResourceUtil.java +++ b/core/src/main/java/io/fabric8/maven/core/util/kubernetes/KubernetesResourceUtil.java @@ -105,7 +105,7 @@ public class KubernetesResourceUtil { public static final String API_VERSION = "v1"; public static final String API_EXTENSIONS_VERSION = "extensions/v1beta1"; - public static final String API_APPS_VERSION = "apps/v1beta1"; + public static final String API_APPS_VERSION = "apps/v1"; public static final String JOB_VERSION = "batch/v1"; public static final String OPENSHIFT_V1_VERSION = "apps.openshift.io/v1"; public static final ResourceVersioning DEFAULT_RESOURCE_VERSIONING = new ResourceVersioning() @@ -249,9 +249,9 @@ private static Map readAndEnrichFragment(PlatformMode platformMo addKind(fragment, kind, file.getName()); String apiVersion = apiVersions.getCoreVersion(); - if (Objects.equals(kind, "Deployment") || Objects.equals(kind, "Ingress")) { + if (Objects.equals(kind, "Ingress")) { apiVersion = apiVersions.getExtensionsVersion(); - } else if (Objects.equals(kind, "StatefulSet")) { + } else if (Objects.equals(kind, "StatefulSet") || Objects.equals(kind, "Deployment")) { apiVersion = apiVersions.getAppsVersion(); } else if (Objects.equals(kind, "Job")) { apiVersion = apiVersions.getJobVersion();