Also make juice-shop labels consistent

juice-shop · Oct 27, 2022 · bd3f933 · bd3f933
1 parent c2ecf82
commit bd3f933
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/cleaner/src/main.js b/cleaner/src/main.js
@@ -44,7 +44,7 @@ async function main() {
     undefined,
     undefined,
     undefined,
-    'app=juice-shop'
+    'app.kubernetes.io/name=juice-shop'
   );
 
   console.log(`Found ${instances.body.items.length} instances. Checking their activity.`);

diff --git a/helm/multi-juicer/templates/juice-shop/servicemonitor.yaml b/helm/multi-juicer/templates/juice-shop/servicemonitor.yaml
@@ -10,8 +10,8 @@ spec:
     - team
   selector:
     matchLabels:
-      app: juice-shop
-      deployment-context: {{ .Release.Name | quote }}
+      app.kubernetes.io/name: 'juice-shop'
+      app.kubernetes.io/managed-by: {{ .Release.Name | quote }}
   endpoints:
     - targetPort: 3000
 {{- end }}
diff --git a/juice-balancer/src/kubernetes.js b/juice-balancer/src/kubernetes.js
@@ -22,9 +22,13 @@ const createDeploymentForTeam = async ({ team, passcodeHash }) => {
     metadata: {
       name: `t-${team}-juiceshop`,
       labels: {
-        app: 'juice-shop',
         team,
-        'deployment-context': get('deploymentContext'),
+        'app.kubernetes.io/version': get('juiceShop.tag'),
+        'app.kubernetes.io/component': 'vulnerable-app',
+        'app.kubernetes.io/managed-by': get('deploymentContext'),
+        'app.kubernetes.io/name': 'juice-shop',
+        'app.kubernetes.io/instance': `juice-shop-${get('deploymentContext')}`,
+        'app.kubernetes.io/part-of': 'multi-juicer',
       },
       annotations: {
         'multi-juicer.iteratec.dev/lastRequest': `${new Date().getTime()}`,
@@ -38,17 +42,21 @@ const createDeploymentForTeam = async ({ team, passcodeHash }) => {
     spec: {
       selector: {
         matchLabels: {
-          app: 'juice-shop',
           team,
-          'deployment-context': get('deploymentContext'),
+          'app.kubernetes.io/name': 'juice-shop',
+          'app.kubernetes.io/managed-by': get('deploymentContext'),
         },
       },
       template: {
         metadata: {
           labels: {
-            app: 'juice-shop',
             team,
-            'deployment-context': get('deploymentContext'),
+            'app.kubernetes.io/version': get('juiceShop.tag'),
+            'app.kubernetes.io/name': 'juice-shop',
+            'app.kubernetes.io/managed-by': get('deploymentContext'),
+            'app.kubernetes.io/component': 'vulnerable-app',
+            'app.kubernetes.io/instance': `juice-shop-${get('deploymentContext')}`,
+            'app.kubernetes.io/part-of': 'multi-juicer',
           },
         },
         spec: {
@@ -142,17 +150,21 @@ const createServiceForTeam = async (teamname) =>
       metadata: {
         name: `t-${teamname}-juiceshop`,
         labels: {
-          app: 'juice-shop',
           team: teamname,
-          'deployment-context': get('deploymentContext'),
+          'app.kubernetes.io/version': get('juiceShop.tag'),
+          'app.kubernetes.io/name': 'juice-shop',
+          'app.kubernetes.io/managed-by': get('deploymentContext'),
+          'app.kubernetes.io/component': 'vulnerable-app',
+          'app.kubernetes.io/instance': `juice-shop-${get('deploymentContext')}`,
+          'app.kubernetes.io/part-of': 'multi-juicer',
         },
         ...(await getOwnerReference()),
       },
       spec: {
         selector: {
-          app: 'juice-shop',
           team: teamname,
-          'deployment-context': get('deploymentContext'),
+          'app.kubernetes.io/name': 'juice-shop',
+          'app.kubernetes.io/managed-by': get('deploymentContext'),
         },
         ports: [
           {
@@ -192,7 +204,10 @@ const getJuiceShopInstances = () =>
       undefined,
       undefined,
       undefined,
-      `app=juice-shop,deployment-context=${get('deploymentContext')}`
+      [
+        `app.kubernetes.io/name=juice-shop`,
+        `app.kubernetes.io/managed-by=${get('deploymentContext')}`,
+      ].join(',')
     )
     .catch((error) => {
       throw new Error(error.response.body.message);
@@ -224,7 +239,11 @@ const deletePodForTeam = async (team) => {
     undefined,
     undefined,
     undefined,
-    `app=juice-shop,team=${team},deployment-context=${get('deploymentContext')}`
+    [
+      `team=${team}`,
+      `app.kubernetes.io/name=juice-shop`,
+      `app.kubernetes.io/managed-by=${get('deploymentContext')}`,
+    ].join(',')
   );
 
   const pods = res.body.items;