Add option to skip ownerReferences on JuiceShop Deployment and Services

This lets MultiJuicer run in older kubernetes cluster which don't support the reference type or the app/v1 deployment type Related to #51
juice-shop · May 7, 2020 · 88b91f9 · 88b91f9
1 parent 4893b1d
commit 88b91f9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/helm/multi-juicer/templates/juice-balancer-config-map.yaml b/helm/multi-juicer/templates/juice-balancer-config-map.yaml
@@ -11,6 +11,7 @@ data:
       "namespace": {{ .Release.Namespace | quote }},
       "deploymentContext": {{ .Release.Name | quote }},
       "maxJuiceShopInstances": {{ .Values.juiceShop.maxInstances}},
+      "skipOwnerReference": {{ .Values.balancer.skipOwnerReference }},
       "cookieParser": {
         "cookieName": {{ include "multi-juicer.cookieName" . | quote }},
         "secure": {{ .Values.balancer.cookie.secure }}

diff --git a/helm/multi-juicer/values.yaml b/helm/multi-juicer/values.yaml
@@ -53,6 +53,9 @@ balancer:
       cpu: 400m
   affinity: {}
   tolerations: []
+  # If set to true this skips setting ownerReferences on the teams JuiceShop Deployment and Services
+  # This lets MultiJuicer run in older kubernetes cluster which don't support the reference type or the app/v1 deployment type
+  skipOwnerReference: false
   metrics:
     # enables prometheus metrics for the balancer
     # if set to true you should change the prometheus-scraper password

diff --git a/juice-balancer/config/config.json b/juice-balancer/config/config.json
@@ -3,6 +3,7 @@
   "namespace": "default",
   "deploymentContext": "multi-juicer",
   "maxJuiceShopInstances": 10,
+  "skipOwnerReference": false,
   "admin": {
     "username": "admin",
     "password": "12345678"

diff --git a/juice-balancer/src/kubernetes.js b/juice-balancer/src/kubernetes.js
@@ -33,16 +33,7 @@ const createDeploymentForTeam = async ({ team, passcodeHash }) => {
         'multi-juicer.iteratec.dev/challengesSolved': '0',
         'multi-juicer.iteratec.dev/continueCode': '',
       },
-      ownerReferences: [
-        {
-          apiVersion: 'apps/v1',
-          blockOwnerDeletion: true,
-          controller: true,
-          kind: 'Deployment',
-          name: 'juice-balancer',
-          uid: await getJuiceBalancerDeploymentUid(),
-        },
-      ],
+      ...(await getOwnerReference()),
     },
     spec: {
       selector: {
@@ -139,16 +130,7 @@ const createServiceForTeam = async teamname =>
           team: teamname,
           'deployment-context': get('deploymentContext'),
         },
-        ownerReferences: [
-          {
-            apiVersion: 'apps/v1',
-            blockOwnerDeletion: true,
-            controller: true,
-            kind: 'Deployment',
-            name: 'juice-balancer',
-            uid: await getJuiceBalancerDeploymentUid(),
-          },
-        ],
+        ...(await getOwnerReference()),
       },
       spec: {
         selector: {
@@ -168,6 +150,24 @@ const createServiceForTeam = async teamname =>
     });
 module.exports.createServiceForTeam = createServiceForTeam;
 
+async function getOwnerReference() {
+  if (get('skipOwnerReference') === true) {
+    return {};
+  }
+  return {
+    ownerReferences: [
+      {
+        apiVersion: 'apps/v1',
+        blockOwnerDeletion: true,
+        controller: true,
+        kind: 'Deployment',
+        name: 'juice-balancer',
+        uid: await getJuiceBalancerDeploymentUid(),
+      },
+    ],
+  };
+}
+
 const getJuiceShopInstances = () =>
   k8sAppsApi
     .listNamespacedDeployment(