fix template errors

3scale · Jan 22, 2020 · 056e6a9 · 056e6a9
1 parent ae4397c
commit 056e6a9
Show file tree

Hide file tree

Showing 10 changed files with 198 additions and 54 deletions.
diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml
@@ -1161,7 +1161,9 @@ objects:
     route_endpoint: https://backend-${TENANT_NAME}.${WILDCARD_DOMAIN}
     service_endpoint: http://backend-listener:3000
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -1178,7 +1180,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -1195,7 +1199,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3679,7 +3685,9 @@ objects:
   stringData:
     SERVERS: system-memcache:11211
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3696,7 +3704,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4134,7 +4144,9 @@ objects:
     ZYNC_AUTHENTICATION_TOKEN: ${ZYNC_AUTHENTICATION_TOKEN}
     ZYNC_DATABASE_PASSWORD: ${ZYNC_DATABASE_PASSWORD}
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4150,7 +4162,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4461,7 +4475,9 @@ objects:
       app: ${APP_LABEL}
       threescale_component: apicast
     name: apicast-environment
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4478,7 +4494,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-eval.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-eval.yml
@@ -1160,7 +1160,9 @@ objects:
     route_endpoint: https://backend-${TENANT_NAME}.${WILDCARD_DOMAIN}
     service_endpoint: http://backend-listener:3000
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -1177,7 +1179,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -1194,7 +1198,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3497,7 +3503,9 @@ objects:
   stringData:
     SERVERS: system-memcache:11211
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3514,7 +3522,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3952,7 +3962,9 @@ objects:
     ZYNC_AUTHENTICATION_TOKEN: ${ZYNC_AUTHENTICATION_TOKEN}
     ZYNC_DATABASE_PASSWORD: ${ZYNC_DATABASE_PASSWORD}
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3968,7 +3980,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4279,7 +4293,9 @@ objects:
       app: ${APP_LABEL}
       threescale_component: apicast
     name: apicast-environment
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4296,7 +4312,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-ha.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-ha.yml
@@ -769,7 +769,9 @@ objects:
     route_endpoint: https://backend-${TENANT_NAME}.${WILDCARD_DOMAIN}
     service_endpoint: http://backend-listener:3000
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -786,7 +788,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -803,7 +807,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -2956,7 +2962,9 @@ objects:
   stringData:
     SERVERS: system-memcache:11211
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -2973,7 +2981,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3429,7 +3439,9 @@ objects:
     ZYNC_AUTHENTICATION_TOKEN: ${ZYNC_AUTHENTICATION_TOKEN}
     ZYNC_DATABASE_PASSWORD: ${ZYNC_DATABASE_PASSWORD}
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3445,7 +3457,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3768,7 +3782,9 @@ objects:
       app: ${APP_LABEL}
       threescale_component: apicast
     name: apicast-environment
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3785,7 +3801,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-postgresql.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-postgresql.yml
@@ -1190,7 +1190,9 @@ objects:
     route_endpoint: https://backend-${TENANT_NAME}.${WILDCARD_DOMAIN}
     service_endpoint: http://backend-listener:3000
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -1207,7 +1209,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -1224,7 +1228,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3519,7 +3525,9 @@ objects:
   stringData:
     SERVERS: system-memcache:11211
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3536,7 +3544,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -3992,7 +4002,9 @@ objects:
     ZYNC_AUTHENTICATION_TOKEN: ${ZYNC_AUTHENTICATION_TOKEN}
     ZYNC_DATABASE_PASSWORD: ${ZYNC_DATABASE_PASSWORD}
   type: Opaque
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4008,7 +4020,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4331,7 +4345,9 @@ objects:
       app: ${APP_LABEL}
       threescale_component: apicast
     name: apicast-environment
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}
@@ -4348,7 +4364,9 @@ objects:
     desiredHealthy: 0
     disruptionsAllowed: 0
     expectedPods: 0
-- metadata:
+- apiVersion: policy/v1beta1
+  kind: PodDisruptionBudget
+  metadata:
     creationTimestamp: null
     labels:
       app: ${APP_LABEL}