Fix #2467: OpenShiftClient cannot replace existing resource with API …

…version =! v1

BackwardCompatibilityInterceptor should only convert openshift4 to openshift3 requests
on receiving 404

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### 4.11-SNAPSHOT
 
 #### Bugs
+* Fix #2467: OpenShiftClient cannot replace existing resource with API version =! v1
 
 #### Improvements
 * Fix #2473: Removed unused ValidationMessages.properties

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/BackwardsCompatibilityInterceptor.java

@@ -24,6 +24,7 @@
 import okio.Buffer;
 
 import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -134,7 +135,7 @@ public Response intercept(Chain chain) throws IOException {
     Response response = chain.proceed(request);
     if (isOpenshiftApiRequest(request)) {
       return handleOpenshiftRequests(request, response, chain);
-    } else if (!response.isSuccessful() && responseCodeToTransformations.keySet().contains(response.code())) {
+    } else if (!response.isSuccessful() && responseCodeToTransformations.containsKey(response.code())) {
       String url = request.url().toString();
       Matcher matcher = getMatcher(url);
       ResourceKey key = getKey(matcher);
@@ -170,7 +171,7 @@ private static ResourceKey getKey(Matcher m) {
   }
 
   private static Response handleOpenshiftRequests(Request request, Response response, Chain chain) throws IOException{
-    if (!response.isSuccessful()) {
+    if (!response.isSuccessful() && response.code() == HttpURLConnection.HTTP_NOT_FOUND) {
       ResourceKey target = getResourceKeyFromRequest(request);
       if (target != null) {
         String requestUrl = request.url().toString();

kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigIT.java

@@ -20,12 +20,12 @@
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.openshift.api.model.BuildConfig;
 import io.fabric8.openshift.api.model.BuildConfigList;
+import io.fabric8.openshift.api.model.BuildSourceBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.arquillian.cube.kubernetes.api.Session;
 import org.arquillian.cube.openshift.impl.requirement.RequiresOpenshift;
 import org.arquillian.cube.requirement.ArquillianConditionalRunner;
 import org.jboss.arquillian.test.api.ArquillianResource;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -88,4 +88,23 @@ public void delete() {
     boolean bDeleted = client.buildConfigs().inNamespace(session.getNamespace()).withName("bc-delete").delete();
     assertTrue(bDeleted);
   }
+
+  @Test
+  public void createOrReplace() {
+    // Given
+    BuildConfig buildConfig = client.buildConfigs().inNamespace(session.getNamespace()).withName("bc-createorreplace").get();
+
+    // When
+    buildConfig.getSpec().setSource(new BuildSourceBuilder()
+      .withNewGit()
+      .withUri("https://github.com/openshift/test2")
+      .endGit()
+      .build());
+    buildConfig = client.buildConfigs().inNamespace(session.getNamespace()).createOrReplace(buildConfig);
+
+    // Then
+    assertNotNull(buildConfig);
+    assertEquals("bc-createorreplace", buildConfig.getMetadata().getName());
+    assertEquals("https://github.com/openshift/test2", buildConfig.getSpec().getSource().getGit().getUri());
+  }
 }

kubernetes-itests/src/test/java/io/fabric8/openshift/DeploymentConfigIT.java

@@ -89,4 +89,19 @@ public void delete() {
     assertTrue(bDeleted);
   }
 
+  @Test
+  public void createOrReplace() {
+    // Given
+    DeploymentConfig deploymentConfig = client.deploymentConfigs().inNamespace(session.getNamespace()).withName("dc-createorreplace").get();
+
+    // When
+    deploymentConfig.getSpec().getTemplate().getSpec().getContainers().get(0).setImage("openshift/hello-openshift:v3.8");
+    deploymentConfig = client.deploymentConfigs().inNamespace(session.getNamespace()).createOrReplace(deploymentConfig);
+
+    // Then
+    assertNotNull(deploymentConfig);
+    assertEquals("dc-createorreplace", deploymentConfig.getMetadata().getName());
+    assertEquals("openshift/hello-openshift:v3.8", deploymentConfig.getSpec().getTemplate().getSpec().getContainers().get(0).getImage());
+  }
+
 }

kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamIT.java

@@ -90,4 +90,19 @@ public void delete() {
     assertTrue(bDeleted);
   }
 
+  @Test
+  public void createOrReplace() {
+    // Given
+    ImageStream imageStream = client.imageStreams().inNamespace(session.getNamespace()).withName("is-createorreplace").get();
+
+    // When
+    imageStream.getSpec().setDockerImageRepository("docker.io/openshift/ruby-centos-2");
+    imageStream = client.imageStreams().inNamespace(session.getNamespace()).createOrReplace(imageStream);
+
+    // Then
+    assertNotNull(imageStream);
+    assertEquals("is-createorreplace", imageStream.getMetadata().getName());
+    assertEquals("docker.io/openshift/ruby-centos-2", imageStream.getSpec().getDockerImageRepository());
+  }
+
 }

kubernetes-itests/src/test/java/io/fabric8/openshift/RouteIT.java

@@ -30,6 +30,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import static junit.framework.TestCase.assertNotNull;
@@ -94,4 +95,21 @@ public void delete() {
     assertTrue(bDeleted);
   }
 
+  @Test
+  public void createOrReplace() {
+    // Given
+    Route route = client.routes().inNamespace(currentNamespace).withName("route-createorreplace").get();
+
+    // When
+    route.getMetadata().setAnnotations(Collections.singletonMap("foo", "bar"));
+    route.getSpec().setHost("test.fabric8.io");
+    route = client.routes().inNamespace(currentNamespace).createOrReplace(route);
+
+    // Then
+    assertNotNull(route);
+    assertEquals("route-createorreplace", route.getMetadata().getName());
+    assertEquals("bar", route.getMetadata().getAnnotations().get("foo"));
+    assertEquals("test.fabric8.io", route.getSpec().getHost());
+  }
+
 }

kubernetes-itests/src/test/resources/buildconfig-it.yml

@@ -130,3 +130,33 @@ spec:
     to:
       kind: "ImageStreamTag"
       name: "origin-ruby-sample:latest"
+---
+kind: "BuildConfig"
+apiVersion: "v1"
+metadata:
+  name: bc-createorreplace
+spec:
+  triggers:
+    - type: "GitHub"
+      github:
+        secret: "secret101"
+    - type: "Generic"
+      generic:
+        secret: "secret101"
+    - type: "ImageChange"
+  source:
+    type: "Git"
+    git:
+      uri: "https://github.com/openshift/ruby-hello-world"
+    dockerfile: "FROM openshift/ruby-22-centos7\nUSER example"
+  strategy:
+    type: "Source"
+    sourceStrategy:
+      from:
+        kind: "ImageStreamTag"
+        name: "ruby-20-centos7:latest"
+  output:
+    to:
+      kind: "ImageStreamTag"
+      name: "origin-ruby-sample:latest"
+

kubernetes-itests/src/test/resources/deploymentconfig-it.yml

@@ -142,3 +142,35 @@ spec:
           name: "origin-ruby-sample:latest"
   strategy:
     type: "Rolling"
+---
+kind: "DeploymentConfig"
+apiVersion: "v1"
+metadata:
+  name: dc-createorreplace
+spec:
+  template:
+    metadata:
+      labels:
+        name: "frontend"
+    spec:
+      containers:
+        - name: "helloworld"
+          image: "openshift/origin-ruby-sample"
+          ports:
+            - containerPort: 8080
+              protocol: "TCP"
+  replicas: 5
+  selector:
+    name: "frontend"
+  triggers:
+    - type: "ConfigChange"
+    - type: "ImageChange"
+      imageChangeParams:
+        automatic: true
+        containerNames:
+          - "helloworld"
+        from:
+          kind: "ImageStreamTag"
+          name: "origin-ruby-sample:latest"
+  strategy:
+    type: "Rolling"

kubernetes-itests/src/test/resources/imagestream-it.yml

@@ -42,3 +42,10 @@ metadata:
   name: "is-delete"
 spec:
   dockerImageRepository: "docker.io/openshift/ruby-20-centos7"
+---
+apiVersion: "v1"
+kind: "ImageStream"
+metadata:
+  name: "is-createorreplace"
+spec:
+  dockerImageRepository: "docker.io/openshift/ruby-20-centos7"

kubernetes-itests/src/test/resources/route-it.yml

@@ -54,3 +54,13 @@ spec:
   to:
     kind: Service
     name: service-name
+---
+apiVersion: v1
+kind: Route
+metadata:
+  name: route-createorreplace
+spec:
+  host: www.example.com
+  to:
+    kind: Service
+    name: service-name