feat(lookup): changed hook-delete-policy (#503)

* feat(lookup): changed hook-delete-policy

* feat(lookup): fixed govcloud companydomain bug

Author: sagar-mamdapure

charts/argus/Chart.yaml

@@ -6,7 +6,7 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 14.0.0-rc01
+version: 14.0.0-rc02
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v17.3.0-rt01
 dependencies:

charts/argus/templates/post-install.yaml

@@ -2,10 +2,16 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: argus-props-patch-{{ .Release.Name }}
+  labels:
+    {{- include "argus.labels" . | nindent 4 }}
+    app.kubernetes.io/job: config-updater
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation
+    {{- include "argus.annotations" . | nindent 4 }}
+
 spec:
+  ttlSecondsAfterFinished: {{ .Values.patchJob.ttlSecondsAfterFinished | default 1800 }} # delete this job from cluster after 30 mins
   template:
     spec:
       containers:
@@ -133,7 +139,7 @@ spec:
                 COMPANY_DOMAIN_ENV=$(cat << EOF
                 {
                   "name": "COMPANY_DOMAIN",
-                  "value": {{ .Values.companyDomain | default "logicmonitor.com" | quote }}
+                  "value": {{ .Values.global.companyDomain | default "logicmonitor.com" | quote }}
                 }
               EOF
                 )

charts/argus/values.schema.json

@@ -88,6 +88,9 @@
         }
       },
       "filters": [],
+      "patchJob": {
+        "ttlSecondsAfterFinished": 1800
+      },
       "selfMonitor": {
         "enable": false,
         "port": 2112
@@ -1410,6 +1413,35 @@
       },
       "additionalProperties": false
     },
+    "patchJob": {
+      "$id": "#/properties/patchJob",
+      "$comment": "tf:optional",
+      "type": "object",
+      "title": "The Argus Props Patch Job Schema",
+      "description": "Configurations for Argus Props Patch Job",
+      "default": {},
+      "examples": [
+        {
+          "ttlSecondsAfterFinished": 1800
+        }
+      ],
+      "required": [],
+      "properties": {
+          "ttlSecondsAfterFinished": {
+          "$comment": "tf:optional",
+          "$id": "#/properties/patchJob/properties/ttlSecondsAfterFinished",
+          "type": "integer",
+          "title": "Time To Live After PatchJob Completion",
+          "description": "Specifies the time-to-live (in seconds) for the patchJob resource after it has completed execution. Once this duration has passed, the job and its associated pods will be automatically cleaned up by Kubernetes",
+          "default": 1800,
+          "examples": [
+              60,
+              1800
+          ]
+          }
+      },
+      "additionalProperties": false
+    },
     "selfMonitor": {
       "$id": "#/properties/selfMonitor",
       "$comment": "tf:optional",

charts/argus/values.yaml

@@ -130,6 +130,8 @@ lm:
       nodes: []
       etcd: []
 filters: []
+patchJob:
+  ttlSecondsAfterFinished: 1800  # delete this job from cluster after 30 mins
 selfMonitor:
   enable: false
   port: 2112

charts/collectorset-controller/Chart.yaml

@@ -6,7 +6,7 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: collectorset-controller
-version: 12.0.0-rc01
+version: 12.0.0-rc02
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v13.2.0-rt01
 dependencies:

charts/collectorset-controller/templates/post-install.yaml

@@ -2,10 +2,15 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: csc-props-patch-{{ .Release.Name }}
+  labels:
+    {{- include "collectorset-controller.labels" . | nindent 4}}
+    app.kubernetes.io/job: config-updater
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation
+    {{- include "collectorset-controller.annotations" . | nindent 4}}
 spec:
+  ttlSecondsAfterFinished: {{ .Values.patchJob.ttlSecondsAfterFinished | default 1800 }} # delete this job from cluster after 30 mins
   template:
     spec:
       containers:
@@ -86,7 +91,7 @@ spec:
                 COMPANY_DOMAIN_ENV=$(cat << EOF
                 {
                   "name": "COMPANY_DOMAIN",
-                  "value": {{ .Values.companyDomain | default "logicmonitor.com" | quote }}
+                  "value": {{ .Values.global.companyDomain | default "logicmonitor.com" | quote }}
                 }
               EOF
                 )

charts/collectorset-controller/values.schema.json

@@ -39,6 +39,9 @@
       "labels": {},
       "annotations": {},
       "ignoreSSL": false,
+      "patchJob": {
+        "ttlSecondsAfterFinished": 1800
+      },
       "global": {
         "accessID": "",
         "accessKey": "",
@@ -514,6 +517,36 @@
         false
       ]
     },
+    "patchJob": {
+      "$id": "#/properties/patchJob",
+      "$comment": "tf:optional",
+      "type": "object",
+      "title": "The CollectorSet Props Patch Job Schema",
+      "description": "Configurations for CollectorSet Props Patch Job",
+      "default": {},
+      "examples": [
+        {
+          "ttlSecondsAfterFinished": 1800
+        }
+      ],
+      "required": [
+      ],
+      "properties": {
+        "ttlSecondsAfterFinished": {
+          "$comment": "tf:optional",
+          "$id": "#/properties/patchJob/properties/ttlSecondsAfterFinished",
+          "type": "integer",
+          "title": "Time To Live After PatchJob Completion",
+          "description": "Specifies the time-to-live (in seconds) for the patchJob resource after it has completed execution. Once this duration has passed, the job and its associated pods will be automatically cleaned up by Kubernetes",
+          "default": 1800,
+          "examples": [
+            60,
+            1800
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
     "global": {
       "$comment": "tf:optional",
       "$id": "#/properties/global",

charts/collectorset-controller/values.yaml

@@ -55,6 +55,8 @@ labels: {}
 annotations: {}
 # Set flag to ignore ssl/tls validation
 ignoreSSL: false
+patchJob:
+  ttlSecondsAfterFinished: 1800  # delete this job from cluster after 30 mins
 
 imagePullSecrets: []
 global: