From 175acd1ab8684be2eb1b2272ef915cd4c43a20c2 Mon Sep 17 00:00:00 2001 From: Linh Lam Date: Fri, 9 Jun 2023 09:42:04 -0700 Subject: [PATCH 1/4] Fix Amazon EKS option Signed-off-by: Linh Lam --- packages/kubecost/cost-analyzer/overlay/questions.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/kubecost/cost-analyzer/overlay/questions.yaml b/packages/kubecost/cost-analyzer/overlay/questions.yaml index 96cf24939..a13d0f498 100644 --- a/packages/kubecost/cost-analyzer/overlay/questions.yaml +++ b/packages/kubecost/cost-analyzer/overlay/questions.yaml @@ -30,16 +30,19 @@ questions: subquestions: - variable: kubecostFrontend.image label: Kubecost frontend image for Amazon EKS + description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/frontend" type: string - default: "public.ecr.aws/kubecost/frontend" + default: false - variable: kubecostModel.image label: Kubecost cost-model image for Amazon EKS + description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/cost-model" type: string - default: "public.ecr.aws/kubecost/cost-model" + default: false - variable: prometheus.server.image.repository label: Kubecost Prometheus image for Amazon EKS + description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/prometheus" type: string - default: "public.ecr.aws/kubecost/prometheus" + default: false - variable: prometheus.server.image.tag label: Kubecost Prometheus image tag for Amazon EKS type: string From bb327cba2e797be9a6efb38309c118eab626ca04 Mon Sep 17 00:00:00 2001 From: Linh Lam Date: Fri, 9 Jun 2023 09:50:56 -0700 Subject: [PATCH 2/4] Fix Amazon EKS option Signed-off-by: Linh Lam --- packages/kubecost/cost-analyzer/overlay/questions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kubecost/cost-analyzer/overlay/questions.yaml b/packages/kubecost/cost-analyzer/overlay/questions.yaml index a13d0f498..3a6be6d27 100644 --- a/packages/kubecost/cost-analyzer/overlay/questions.yaml +++ b/packages/kubecost/cost-analyzer/overlay/questions.yaml @@ -22,7 +22,7 @@ questions: # Amazon EKS - variable: AmazonEKS.enabled label: Amazon EKS cluster - description: "If true, Kubecost will be installed with the images from https://gallery.ecr.aws/kubecost/" + description: "If true, Kubecost will be installed with the images and helm chart from https://gallery.ecr.aws/kubecost/" type: boolean default: false show_subquestion_if: true From 9700753fa604039a4c4185be9ae30c62c850a383 Mon Sep 17 00:00:00 2001 From: Linh Lam Date: Fri, 9 Jun 2023 09:53:16 -0700 Subject: [PATCH 3/4] Fix Amazon EKS option Signed-off-by: Linh Lam --- charts/kubecost/cost-analyzer/questions.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/kubecost/cost-analyzer/questions.yaml b/charts/kubecost/cost-analyzer/questions.yaml index 96cf24939..3a6be6d27 100644 --- a/charts/kubecost/cost-analyzer/questions.yaml +++ b/charts/kubecost/cost-analyzer/questions.yaml @@ -22,7 +22,7 @@ questions: # Amazon EKS - variable: AmazonEKS.enabled label: Amazon EKS cluster - description: "If true, Kubecost will be installed with the images from https://gallery.ecr.aws/kubecost/" + description: "If true, Kubecost will be installed with the images and helm chart from https://gallery.ecr.aws/kubecost/" type: boolean default: false show_subquestion_if: true @@ -30,16 +30,19 @@ questions: subquestions: - variable: kubecostFrontend.image label: Kubecost frontend image for Amazon EKS + description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/frontend" type: string - default: "public.ecr.aws/kubecost/frontend" + default: false - variable: kubecostModel.image label: Kubecost cost-model image for Amazon EKS + description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/cost-model" type: string - default: "public.ecr.aws/kubecost/cost-model" + default: false - variable: prometheus.server.image.repository label: Kubecost Prometheus image for Amazon EKS + description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/prometheus" type: string - default: "public.ecr.aws/kubecost/prometheus" + default: false - variable: prometheus.server.image.tag label: Kubecost Prometheus image tag for Amazon EKS type: string From 4b1627a84eb06c75ae7d3ff592ce530579d02311 Mon Sep 17 00:00:00 2001 From: Linh Lam Date: Fri, 9 Jun 2023 13:15:25 -0700 Subject: [PATCH 4/4] add description as a workaround Signed-off-by: Linh Lam --- charts/kubecost/cost-analyzer/questions.yaml | 6 +++--- packages/kubecost/cost-analyzer/overlay/questions.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/kubecost/cost-analyzer/questions.yaml b/charts/kubecost/cost-analyzer/questions.yaml index 3a6be6d27..7717d04dc 100644 --- a/charts/kubecost/cost-analyzer/questions.yaml +++ b/charts/kubecost/cost-analyzer/questions.yaml @@ -32,17 +32,17 @@ questions: label: Kubecost frontend image for Amazon EKS description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/frontend" type: string - default: false + default: "" - variable: kubecostModel.image label: Kubecost cost-model image for Amazon EKS description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/cost-model" type: string - default: false + default: "" - variable: prometheus.server.image.repository label: Kubecost Prometheus image for Amazon EKS description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/prometheus" type: string - default: false + default: "" - variable: prometheus.server.image.tag label: Kubecost Prometheus image tag for Amazon EKS type: string diff --git a/packages/kubecost/cost-analyzer/overlay/questions.yaml b/packages/kubecost/cost-analyzer/overlay/questions.yaml index 3a6be6d27..7717d04dc 100644 --- a/packages/kubecost/cost-analyzer/overlay/questions.yaml +++ b/packages/kubecost/cost-analyzer/overlay/questions.yaml @@ -32,17 +32,17 @@ questions: label: Kubecost frontend image for Amazon EKS description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/frontend" type: string - default: false + default: "" - variable: kubecostModel.image label: Kubecost cost-model image for Amazon EKS description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/cost-model" type: string - default: false + default: "" - variable: prometheus.server.image.repository label: Kubecost Prometheus image for Amazon EKS description: "Use this image for the Amazon EKS cluster: public.ecr.aws/kubecost/prometheus" type: string - default: false + default: "" - variable: prometheus.server.image.tag label: Kubecost Prometheus image tag for Amazon EKS type: string