feat(controller): allow default reconcile behavior to be configurable (…

…#372) * chore(dep): razee/[email protected] pick up change to propagate options through the event emitter * chore(dep): razee/[email protected] Pick up enhancement to the base controller to allow for controlling the reconcile behavior on resources managed by razee * feat(controller): allow default reconcile behavior to be configurable introduces additional environment variables to control the default reconcile behavior of the remote resource controllers The environment variable RR_RECONCILE_BY_DEFAULT will set the reconcile behavior. The default is true if not set Co-authored-by: Eric Satterwhite <[email protected]>
razee-io · Nov 4, 2022 · 513cf66 · 513cf66
1 parent 1970c6b
commit 513cf66
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 28 deletions.
diff --git a/kubernetes/RemoteResource/resource.yaml b/kubernetes/RemoteResource/resource.yaml
@@ -48,6 +48,12 @@ items:
                   value: razee-io/remoteresource
                 - name: USER_AGENT_VERSION
                   value: "{{{TRAVIS_TAG}}}"
+                - name: RR_RECONCILE_BY_DEFAULT
+                  valueFrom:
+                    configMapKeyRef:
+                      name: razeedeploy-overrides
+                      key: RR_RECONCILE_BY_DEFAULT
+                      optional: true
                 - name: CRD_WATCH_TIMEOUT_SECONDS
                   valueFrom:
                     configMapKeyRef:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,8 +42,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@razee/kubernetes-util": "^1.0.1",
-    "@razee/razeedeploy-core": "^1.2.2",
+    "@razee/kubernetes-util": "^1.1.0",
+    "@razee/razeedeploy-core": "^1.3.0",
     "axios": "^0.27.2",
     "bunyan": "^1.8.15",
     "clone": "^2.1.2",

diff --git a/src/BackendServiceFactory.js b/src/BackendServiceFactory.js
@@ -20,20 +20,17 @@ const objectPath = require('object-path');
 module.exports = class BackendServiceFactory {
   constructor(params) {
     this.eventParams = params;
+    const backendService = objectPath.get(this.eventParams, 'eventData.object.spec.backendService', '').toLowerCase();
+
+    let controllerString = 'RemoteResource';
+    if (backendService == 's3') controllerString = 'RemoteResourceS3';
+    if (backendService == 'git') controllerString = 'RemoteResourceGit';
+    this.controllerString = controllerString;
   }
 
   async execute() {
-    const backendService = objectPath.get(this.eventParams, 'eventData.object.spec.backendService', '').toLowerCase();
-    let controllerString;
-    if (backendService === 's3') {
-      controllerString = 'RemoteResourceS3';
-    } else if (backendService === 'git') {
-      controllerString = 'RemoteResourceGit';
-    } else { // generic
-      controllerString = 'RemoteResource';
-    }
-    this.eventParams.logger.info(`Running ${controllerString}Controller.`);
-    const Controller = require(`./${controllerString}Controller`);
+    this.eventParams.logger.info(`Running ${this.controllerString}Controller.`);
+    const Controller = require(`./${this.controllerString}Controller`);
     const controller = new Controller(this.eventParams);
     return await controller.execute();
   }

diff --git a/src/index.js b/src/index.js
@@ -31,7 +31,10 @@ async function createNewEventHandler(kc) {
       kubeClass: kc,
       logger: log,
       requestOptions: { qs: { timeoutSeconds: process.env.CRD_WATCH_TIMEOUT_SECONDS || 300 } },
-      livenessInterval: true
+      livenessInterval: true,
+      options: {
+        reconcileByDefault: process.env.RR_RECONCILE_BY_DEFAULT || true
+      }
     };
     result = new EventHandler(params);
   } else {