Remove UUID suffix from created objects

Signed-off-by: Raul Sevilla <[email protected]>

Author: rsevilla87

docs/kube-burner.md

@@ -50,6 +50,7 @@ Each iteration of this workload creates the following objects:
   - 1 deployment holding a postgresql database
   - 5 deployments consisting of a client application for the previous database
   - 1 service pointing to the postgresl database
+  - 10 secrets
 
 - **max-services**: This workload is a cluster limits focused test which creates maximum possible services per namespace. It **will create a single namespace, each iteration of this workload will populate that namespace with these objects:**
   - 1 simple application deployment (hello-openshift)

roles/kube-burner/files/app-deployment.yml

@@ -1,12 +1,12 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: perfapp-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+  name: perfapp-{{.Replica}}-{{.Iteration}}
 spec:
   template:
     metadata:
       labels:
-        name: perfapp-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+        name: perfapp-{{.Replica}}-{{.Iteration}}
     spec:
       nodeSelector:
         {{.nodeSelectorKey}}: {{.nodeSelectorValue}}
@@ -32,7 +32,7 @@ spec:
         - name: POSTGRESQL_DATABASE
           value: kubelet-density
         - name: POSTGRESQL_HOSTNAME
-          value: postgres-{{.Iteration}}-{{.UUID}}
+          value: postgres-{{.Iteration}}
         - name: POSTGRESQL_PORT
           value: '5432'
         - name: POSTGRESQL_RETRY_INTERVAL
@@ -44,7 +44,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      name: perfapp-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+      name: perfapp-{{.Replica}}-{{.Iteration}}
   triggers:
   - type: ConfigChange
   strategy:

roles/kube-burner/files/build.yml

@@ -2,7 +2,7 @@
 kind: Build
 apiVersion: build.openshift.io/v1
 metadata:
-  name: {{.JobName}}-{{.Replica}}-{{.UUID}}
+  name: {{.JobName}}-{{.Replica}}
 spec:
   nodeSelector:
     {{.nodeSelectorKey}}: {{.nodeSelectorValue}}
@@ -21,4 +21,4 @@ spec:
   output:
     to:
       kind: ImageStreamTag
-      name: {{.prefix}}-{{.Replica}}-{{.UUID}}:latest
+      name: {{.prefix}}-{{.Replica}}:latest

roles/kube-burner/files/buildconfig.yml

@@ -2,14 +2,14 @@
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
-  name: {{.JobName}}-{{.Replica}}-{{.UUID}}
+  name: {{.JobName}}-{{.Replica}}
 spec:
   nodeSelector:
     {{.nodeSelectorKey}}: {{.nodeSelectorValue}}
   triggers:
   - type: GitHub
     github:
-      secret: {{.JobName}}-{{.Replica}}-{{.UUID}}
+      secret: {{.JobName}}-{{.Replica}}
   - type: ImageChange
   source:
     type: Git
@@ -20,8 +20,8 @@ spec:
     sourceStrategy:
       from:
         kind: ImageStreamTag
-        name: {{.from}}-{{.Replica}}-{{.UUID}}:latest
+        name: {{.from}}-{{.Replica}}:latest
   output:
     to:
       kind: ImageStreamTag
-      name: {{.to}}-{{.Replica}}-{{.UUID}}:latest
+      name: {{.to}}-{{.Replica}}:latest

roles/kube-burner/files/configmap.yml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{.JobName}}-{{.Replica}}-{{.UUID}}
+  name: {{.JobName}}-{{.Replica}}
 data:
   key1: "3"
   key2: "value"

roles/kube-burner/files/deployment.yml

@@ -2,16 +2,16 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: {{.name}}-{{.Replica}}-{{.UUID}}
+  name: {{.name}}-{{.Replica}}
 spec:
   replicas: {{.podReplicas}}
   selector:
     matchLabels:
-      app: {{.name}}-{{.Iteration}}-{{.Replica}}-{{.UUID}}
+      app: {{.name}}-{{.Iteration}}-{{.Replica}}
   template:
     metadata:
       labels:
-        app: {{.name}}-{{.Iteration}}-{{.Replica}}-{{.UUID}}
+        app: {{.name}}-{{.Iteration}}-{{.Replica}}
     spec:
       nodeSelector:
         {{.nodeSelectorKey}}: {{.nodeSelectorValue}}
@@ -46,16 +46,16 @@ spec:
       volumes:
       - name: secret-1
         secret:
-          secretName: {{.JobName}}-1-{{.UUID}}
+          secretName: {{.JobName}}-1
       - name: secret-2
         secret:
-          secretName: {{.JobName}}-2-{{.UUID}}
+          secretName: {{.JobName}}-2
       - name: configmap-1
         configMap:
-          name: {{.JobName}}-1-{{.UUID}}
+          name: {{.JobName}}-1
       - name: configmap-2
         configMap:
-          name: {{.JobName}}-2-{{.UUID}}
+          name: {{.JobName}}-2
       # Add not-ready/unreachable tolerations for 15 minutes so that node
       # failure doesn't trigger pod deletion.
       tolerations:

roles/kube-burner/files/imagestream.yml

@@ -2,8 +2,8 @@
 kind: ImageStream
 apiVersion: image.openshift.io/v1
 metadata:
-  name: {{.prefix}}-{{.Replica}}-{{.UUID}}
+  name: {{.prefix}}-{{.Replica}}
 spec:
-{{ if .image }}
+{{ if index . "image" }}
   dockerImageRepository: {{.image}}
 {{ end }}

roles/kube-burner/files/pod.yml

@@ -1,7 +1,7 @@
 kind: Pod
 apiVersion: v1
 metadata:
-  name: {{.JobName}}-{{.Iteration}}-{{.UUID}}
+  name: {{.JobName}}-{{.Iteration}}
   labels:
     name: {{.JobName}}
 spec:

roles/kube-burner/files/postgres-deployment.yml

@@ -1,12 +1,12 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: postgres-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+  name: postgres-{{.Replica}}-{{.Iteration}}
 spec:
   template:
     metadata:
       labels:
-        name: postgres-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+        name: postgres-{{.Replica}}-{{.Iteration}}
     spec:
       nodeSelector:
         {{.nodeSelectorKey}}: {{.nodeSelectorValue}}
@@ -30,7 +30,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      name: postgres-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+      name: postgres-{{.Replica}}-{{.Iteration}}
   triggers:
   - type: ConfigChange
   strategy:

roles/kube-burner/files/postgres-service.yml

@@ -2,10 +2,10 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: postgres-{{.Iteration}}-{{.UUID}}
+  name: postgres-{{.Iteration}}
 spec:
   selector:
-    name: postgres-{{.Replica}}-{{.Iteration}}-{{.UUID}}
+    name: postgres-{{.Replica}}-{{.Iteration}}
   ports:
   - protocol: TCP
     port: 5432