From a124d314459fa04d1ed69fc44fdf15fb7efc756c Mon Sep 17 00:00:00 2001 From: Jon Edvald Date: Fri, 7 Jun 2019 21:52:43 +0200 Subject: [PATCH] chore(k8s): remove unused _system symbol in config --- garden-service/src/plugins/kubernetes/config.ts | 1 - garden-service/src/plugins/kubernetes/local/config.ts | 3 --- garden-service/src/plugins/kubernetes/system.ts | 7 +------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/garden-service/src/plugins/kubernetes/config.ts b/garden-service/src/plugins/kubernetes/config.ts index dd9027532f..fcfe122c51 100644 --- a/garden-service/src/plugins/kubernetes/config.ts +++ b/garden-service/src/plugins/kubernetes/config.ts @@ -278,5 +278,4 @@ export const configSchema = kubernetesConfigBase .allow("nginx", false, null) .default(false) .description("Set this to `nginx` to install/enable the NGINX ingress controller."), - _system: Joi.any().meta({ internal: true }), }) diff --git a/garden-service/src/plugins/kubernetes/local/config.ts b/garden-service/src/plugins/kubernetes/local/config.ts index d579d0645f..521929e4e2 100644 --- a/garden-service/src/plugins/kubernetes/local/config.ts +++ b/garden-service/src/plugins/kubernetes/local/config.ts @@ -23,7 +23,6 @@ import { ContainerRegistryConfig } from "../../container/config" const supportedContexts = ["docker-for-desktop", "microk8s", "minikube"] export interface LocalKubernetesConfig extends KubernetesBaseConfig { - _system?: Symbol setupIngressController: string | null } @@ -42,7 +41,6 @@ export const configSchema = kubernetesConfigBase .allow("nginx", false, null) .default("nginx") .description("Set this to null or false to skip installing/enabling the `nginx` ingress controller."), - _system: Joi.any().meta({ internal: true }), }) .description("The provider configuration for the local-kubernetes plugin.") @@ -145,7 +143,6 @@ export async function configureProvider({ config, log, projectName }: ConfigureP storage: config.storage, setupIngressController: config.setupIngressController, tlsCertificates: config.tlsCertificates, - _system: config._system, _systemServices, } diff --git a/garden-service/src/plugins/kubernetes/system.ts b/garden-service/src/plugins/kubernetes/system.ts index c5b6ed2e3a..e2b6b7ec6c 100644 --- a/garden-service/src/plugins/kubernetes/system.ts +++ b/garden-service/src/plugins/kubernetes/system.ts @@ -29,14 +29,10 @@ const GARDEN_VERSION = getPackageVersion() const SYSTEM_NAMESPACE_MIN_VERSION = "0.9.0" const systemProjectPath = join(STATIC_DIR, "kubernetes", "system") -export const systemSymbol = Symbol() + export const systemNamespace = "garden-system" export const systemMetadataNamespace = "garden-system--metadata" -export function isSystemGarden(provider: KubernetesProvider): boolean { - return provider.config._system === systemSymbol -} - export async function getSystemGarden(provider: KubernetesProvider, variables: PrimitiveMap): Promise { return Garden.factory(systemProjectPath, { environmentName: "default", @@ -54,7 +50,6 @@ export async function getSystemGarden(provider: KubernetesProvider, variables: P name: "local-kubernetes", context: provider.config.context, namespace: systemNamespace, - _system: systemSymbol, _systemServices: [], }, ],