refactor: (4) inline functions into class methods

garden-io · Nov 8, 2023 · 30d0401 · 30d0401
1 parent 7d05f5a
commit 30d0401
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 111 deletions.
diff --git a/core/src/plugins/kubernetes/nginx/nginx-helm-ephemeral.ts b/core/src/plugins/kubernetes/nginx/nginx-helm-ephemeral.ts
@@ -12,47 +12,45 @@ import { HelmGardenIngressController } from "./nginx-helm.js"
 
 export class EphemeralHelmGardenIngressController extends HelmGardenIngressController {
   helmValuesGetter(): NginxHelmValuesGetter {
-    return getEphemeralNginxHelmValues
-  }
-}
-
-export const getEphemeralNginxHelmValues: NginxHelmValuesGetter = (systemVars: SystemVars) => {
-  return {
-    name: "ingress-controller",
-    controller: {
-      kind: "Deployment",
-      updateStrategy: {
-        type: "RollingUpdate",
-        rollingUpdate: {
-          maxUnavailable: 1,
+    return (systemVars: SystemVars) => {
+      return {
+        name: "ingress-controller",
+        controller: {
+          kind: "Deployment",
+          updateStrategy: {
+            type: "RollingUpdate",
+            rollingUpdate: {
+              maxUnavailable: 1,
+            },
+          },
+          extraArgs: {
+            "default-backend-service": `${systemVars.namespace}/default-backend`,
+          },
+          minReadySeconds: 1,
+          tolerations: systemVars["system-tolerations"],
+          nodeSelector: systemVars["system-node-selector"],
+          admissionWebhooks: {
+            enabled: false,
+          },
+          ingressClassResource: {
+            name: "nginx",
+            enabled: true,
+            default: true,
+          },
+          replicaCount: 1,
+          service: {
+            annotations: {
+              "kubernetes.namespace.so/expose": "true",
+              "kubernetes.namespace.so/exposed-port-80": "wildcard",
+              "kubernetes.namespace.so/exposed-port-443": "wildcard",
+            },
+            type: "LoadBalancer",
+          },
         },
-      },
-      extraArgs: {
-        "default-backend-service": `${systemVars.namespace}/default-backend`,
-      },
-      minReadySeconds: 1,
-      tolerations: systemVars["system-tolerations"],
-      nodeSelector: systemVars["system-node-selector"],
-      admissionWebhooks: {
-        enabled: false,
-      },
-      ingressClassResource: {
-        name: "nginx",
-        enabled: true,
-        default: true,
-      },
-      replicaCount: 1,
-      service: {
-        annotations: {
-          "kubernetes.namespace.so/expose": "true",
-          "kubernetes.namespace.so/exposed-port-80": "wildcard",
-          "kubernetes.namespace.so/exposed-port-443": "wildcard",
+        defaultBackend: {
+          enabled: false,
         },
-        type: "LoadBalancer",
-      },
-    },
-    defaultBackend: {
-      enabled: false,
-    },
+      }
+    }
   }
 }
diff --git a/core/src/plugins/kubernetes/nginx/nginx-helm-generic.ts b/core/src/plugins/kubernetes/nginx/nginx-helm-generic.ts
@@ -12,45 +12,43 @@ import { HelmGardenIngressController } from "./nginx-helm.js"
 
 export class GenericHelmGardenIngressController extends HelmGardenIngressController {
   helmValuesGetter(): NginxHelmValuesGetter {
-    return getGenericNginxHelmValues
-  }
-}
-
-export const getGenericNginxHelmValues: NginxHelmValuesGetter = (systemVars: SystemVars) => {
-  return {
-    name: "ingress-controller",
-    controller: {
-      kind: "DaemonSet",
-      updateStrategy: {
-        type: "RollingUpdate",
-        rollingUpdate: {
-          maxUnavailable: 1,
+    return (systemVars: SystemVars) => {
+      return {
+        name: "ingress-controller",
+        controller: {
+          kind: "DaemonSet",
+          updateStrategy: {
+            type: "RollingUpdate",
+            rollingUpdate: {
+              maxUnavailable: 1,
+            },
+          },
+          extraArgs: {
+            "default-backend-service": `${systemVars.namespace}/default-backend`,
+          },
+          minReadySeconds: 1,
+          tolerations: systemVars["system-tolerations"],
+          nodeSelector: systemVars["system-node-selector"],
+          admissionWebhooks: {
+            enabled: false,
+          },
+          ingressClassResource: {
+            name: "nginx",
+            enabled: true,
+            default: true,
+          },
+          hostPort: {
+            enabled: true,
+            ports: {
+              http: systemVars["ingress-http-port"],
+              https: systemVars["ingress-https-port"],
+            },
+          },
         },
-      },
-      extraArgs: {
-        "default-backend-service": `${systemVars.namespace}/default-backend`,
-      },
-      minReadySeconds: 1,
-      tolerations: systemVars["system-tolerations"],
-      nodeSelector: systemVars["system-node-selector"],
-      admissionWebhooks: {
-        enabled: false,
-      },
-      ingressClassResource: {
-        name: "nginx",
-        enabled: true,
-        default: true,
-      },
-      hostPort: {
-        enabled: true,
-        ports: {
-          http: systemVars["ingress-http-port"],
-          https: systemVars["ingress-https-port"],
+        defaultBackend: {
+          enabled: false,
         },
-      },
-    },
-    defaultBackend: {
-      enabled: false,
-    },
+      }
+    }
   }
 }
diff --git a/core/src/plugins/kubernetes/nginx/nginx-helm-k3s.ts b/core/src/plugins/kubernetes/nginx/nginx-helm-k3s.ts
@@ -12,39 +12,37 @@ import { HelmGardenIngressController } from "./nginx-helm.js"
 
 export class K3sHelmGardenIngressController extends HelmGardenIngressController {
   helmValuesGetter(): NginxHelmValuesGetter {
-    return getK3sNginxHelmValues
-  }
-}
-
-export const getK3sNginxHelmValues: NginxHelmValuesGetter = (systemVars: SystemVars) => {
-  return {
-    name: "ingress-controller",
-    controller: {
-      kind: "Deployment",
-      updateStrategy: {
-        type: "RollingUpdate",
-        rollingUpdate: {
-          maxUnavailable: 1,
+    return (systemVars: SystemVars) => {
+      return {
+        name: "ingress-controller",
+        controller: {
+          kind: "Deployment",
+          updateStrategy: {
+            type: "RollingUpdate",
+            rollingUpdate: {
+              maxUnavailable: 1,
+            },
+          },
+          extraArgs: {
+            "default-backend-service": `${systemVars.namespace}/default-backend`,
+          },
+          minReadySeconds: 1,
+          tolerations: systemVars["system-tolerations"],
+          nodeSelector: systemVars["system-node-selector"],
+          admissionWebhooks: {
+            enabled: false,
+          },
+          ingressClassResource: {
+            name: "nginx",
+            enabled: true,
+            default: true,
+          },
+          replicaCount: 1,
+        },
+        defaultBackend: {
+          enabled: false,
         },
-      },
-      extraArgs: {
-        "default-backend-service": `${systemVars.namespace}/default-backend`,
-      },
-      minReadySeconds: 1,
-      tolerations: systemVars["system-tolerations"],
-      nodeSelector: systemVars["system-node-selector"],
-      admissionWebhooks: {
-        enabled: false,
-      },
-      ingressClassResource: {
-        name: "nginx",
-        enabled: true,
-        default: true,
-      },
-      replicaCount: 1,
-    },
-    defaultBackend: {
-      enabled: false,
-    },
+      }
+    }
   }
 }