Merge pull request #108 from akeneo/ClementGautier-patch-1

Fix namespace issue

Author: ClementGautier

.ci/Jenkinsfile

@@ -627,7 +627,7 @@ def queue(String phpApiImageName, String pimImageName, String pimVersion, String
                     sh "kubectl apply -f /home/jenkins/php-api-client/.ci/k8s/${k8s_template}"
                     sh "gcloud.phar ${verbosity} job:wait --dotsperline ${linesize} ${env.NODE_NAME}-results-subscription ${size} ${env.WORKSPACE} --ansi"
                 } finally {
-                    sh "kubectl delete job ${env.NODE_NAME} --namespace=jenkins-prod"
+                    sh "kubectl delete job ${env.NODE_NAME}"
                     sh "gcloud.phar pubsub:topic:delete ${env.NODE_NAME}"
                     sh "gcloud.phar pubsub:topic:delete ${env.NODE_NAME}-results"
                     sh "gcloud.phar pubsub:subscription:delete ${env.NODE_NAME}-subscription"

.ci/k8s/pim_17_ce.dev.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: test-php-api-client-pim17
-  namespace: jenkins-prod
 spec:
   initContainers:
     - name: php-api-client-data
@@ -115,7 +114,7 @@ spec:
           wait $CHILD_PID
           if [[ -f "/tmp/pod/main-terminated" ]]; then exit 0; fi
       env:
-        - { name: REDIS_URI, value: "tcp://redis.jenkins-prod:6379" }
+        - { name: REDIS_URI, value: "tcp://redis.jenkins:6379" }
         - { name: POD_NAME, valueFrom: { fieldRef: { fieldPath: metadata.name } } }
         - { name: NAMESPACE, valueFrom: { fieldRef: { fieldPath: metadata.namespace } } }
       volumeMounts:

.ci/k8s/pim_17_ce.yaml

@@ -94,7 +94,7 @@ spec:
               trap "touch /tmp/pod/main-terminated" EXIT
               gcloud.phar pubsub:message:consume SUBSCRIPTION_NAME RESULT_TOPIC
           env:
-            - { name: REDIS_URI, value: "tcp://redis.jenkins-prod:6379" }
+            - { name: REDIS_URI, value: "tcp://redis.jenkins:6379" }
             - { name: POD_NAME, valueFrom: { fieldRef: { fieldPath: metadata.name } } }
             - { name: NAMESPACE, valueFrom: { fieldRef: { fieldPath: metadata.namespace } } }
           volumeMounts:

.ci/k8s/pim_20_ce.dev.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: test-php-api-client-pim20
-  namespace: jenkins-prod
 spec:
   initContainers:
     - name: php-api-client-data
@@ -153,7 +152,7 @@ spec:
           wait $CHILD_PID
           if [[ -f "/tmp/pod/main-terminated" ]]; then exit 0; fi
       env:
-        - { name: REDIS_URI, value: "tcp://redis.jenkins-prod:6379" }
+        - { name: REDIS_URI, value: "tcp://redis.jenkins:6379" }
         - { name: POD_NAME, valueFrom: { fieldRef: { fieldPath: metadata.name } } }
         - { name: NAMESPACE, valueFrom: { fieldRef: { fieldPath: metadata.namespace } } }
       volumeMounts:

.ci/k8s/pim_20_ce.yaml

@@ -130,7 +130,7 @@ spec:
               trap "touch /tmp/pod/main-terminated" EXIT
               gcloud.phar pubsub:message:consume SUBSCRIPTION_NAME RESULT_TOPIC
           env:
-            - { name: REDIS_URI, value: "tcp://redis.jenkins-prod:6379" }
+            - { name: REDIS_URI, value: "tcp://redis.jenkins:6379" }
             - { name: POD_NAME, valueFrom: { fieldRef: { fieldPath: metadata.name } } }
             - { name: NAMESPACE, valueFrom: { fieldRef: { fieldPath: metadata.namespace } } }
           volumeMounts: