From 1c861fd53baf734dca1ac044134b39f8df987923 Mon Sep 17 00:00:00 2001
From: Mustafa Gezen <mustafa@ctrliq.com>
Date: Mon, 31 Oct 2022 16:38:32 +0100
Subject: [PATCH] Add chart manifests to all services except Apollo UI

---
 apollo/cmd/apollo/ci/BUILD.bazel              |  2 ++
 apollo/cmd/apollo/ci/Chart.yaml               |  6 ++++
 apollo/cmd/apollo/ci/values.yaml              |  3 ++
 apollo/cmd/apollostarter/ci/BUILD.bazel       |  2 ++
 apollo/cmd/apollostarter/ci/Chart.yaml        |  6 ++++
 apollo/cmd/apollostarter/ci/values.yaml       |  1 +
 apollo/cmd/apolloworker/ci/BUILD.bazel        |  2 ++
 apollo/cmd/apolloworker/ci/Chart.yaml         |  6 ++++
 apollo/cmd/apolloworker/ci/values.yaml        |  1 +
 ci/temporal.jsonnet                           |  4 ++-
 obsidian/cmd/v1/obsidian/ci/BUILD.bazel       |  2 ++
 obsidian/cmd/v1/obsidian/ci/Chart.yaml        |  6 ++++
 obsidian/cmd/v1/obsidian/ci/values.yaml       |  3 ++
 obsidian/ui/BUILD                             |  2 ++
 obsidian/ui/Chart.yaml                        |  6 ++++
 obsidian/ui/values.yaml                       |  3 ++
 peridot/cmd/v1/keykeeper/ci/BUILD.bazel       |  2 ++
 peridot/cmd/v1/keykeeper/ci/Chart.yaml        |  6 ++++
 peridot/cmd/v1/keykeeper/ci/values.yaml       |  9 ++++++
 .../cmd/v1/peridotephemeral/ci/BUILD.bazel    |  2 ++
 peridot/cmd/v1/peridotephemeral/ci/Chart.yaml |  6 ++++
 .../cmd/v1/peridotephemeral/ci/values.yaml    | 32 +++++++++++++++++++
 peridot/cmd/v1/yumrepofs/ci/BUILD.bazel       |  2 ++
 peridot/cmd/v1/yumrepofs/ci/Chart.yaml        |  6 ++++
 peridot/cmd/v1/yumrepofs/ci/values.yaml       | 10 ++++++
 .../cmd/v1/yumrepofsupdater/ci/BUILD.bazel    |  2 ++
 peridot/cmd/v1/yumrepofsupdater/ci/Chart.yaml |  6 ++++
 .../cmd/v1/yumrepofsupdater/ci/values.yaml    |  7 ++++
 peridot/ui/BUILD                              |  2 ++
 peridot/ui/Chart.yaml                         |  6 ++++
 peridot/ui/values.yaml                        |  3 ++
 31 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 apollo/cmd/apollo/ci/Chart.yaml
 create mode 100644 apollo/cmd/apollo/ci/values.yaml
 create mode 100644 apollo/cmd/apollostarter/ci/Chart.yaml
 create mode 100644 apollo/cmd/apollostarter/ci/values.yaml
 create mode 100644 apollo/cmd/apolloworker/ci/Chart.yaml
 create mode 100644 apollo/cmd/apolloworker/ci/values.yaml
 create mode 100644 obsidian/cmd/v1/obsidian/ci/Chart.yaml
 create mode 100644 obsidian/cmd/v1/obsidian/ci/values.yaml
 create mode 100644 obsidian/ui/Chart.yaml
 create mode 100644 obsidian/ui/values.yaml
 create mode 100644 peridot/cmd/v1/keykeeper/ci/Chart.yaml
 create mode 100644 peridot/cmd/v1/keykeeper/ci/values.yaml
 create mode 100644 peridot/cmd/v1/peridotephemeral/ci/Chart.yaml
 create mode 100644 peridot/cmd/v1/peridotephemeral/ci/values.yaml
 create mode 100644 peridot/cmd/v1/yumrepofs/ci/Chart.yaml
 create mode 100644 peridot/cmd/v1/yumrepofs/ci/values.yaml
 create mode 100644 peridot/cmd/v1/yumrepofsupdater/ci/Chart.yaml
 create mode 100644 peridot/cmd/v1/yumrepofsupdater/ci/values.yaml
 create mode 100644 peridot/ui/Chart.yaml
 create mode 100644 peridot/ui/values.yaml

diff --git a/apollo/cmd/apollo/ci/BUILD.bazel b/apollo/cmd/apollo/ci/BUILD.bazel
index 94bd2e07..410353c1 100644
--- a/apollo/cmd/apollo/ci/BUILD.bazel
+++ b/apollo/cmd/apollo/ci/BUILD.bazel
@@ -15,5 +15,7 @@ peridot_k8s(
     name = "apollo",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/apollo/cmd/apollo/ci/Chart.yaml b/apollo/cmd/apollo/ci/Chart.yaml
new file mode 100644
index 00000000..e4fc1151
--- /dev/null
+++ b/apollo/cmd/apollo/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: apollo
+description: Helm chart for apollo
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/apollo/cmd/apollo/ci/values.yaml b/apollo/cmd/apollo/ci/values.yaml
new file mode 100644
index 00000000..724e8ce5
--- /dev/null
+++ b/apollo/cmd/apollo/ci/values.yaml
@@ -0,0 +1,3 @@
+# Ports under requires ingressHost to be set during deploy
+http:
+  ingressHost: null
diff --git a/apollo/cmd/apollostarter/ci/BUILD.bazel b/apollo/cmd/apollostarter/ci/BUILD.bazel
index a01c778d..7b4f2dc9 100644
--- a/apollo/cmd/apollostarter/ci/BUILD.bazel
+++ b/apollo/cmd/apollostarter/ci/BUILD.bazel
@@ -12,6 +12,8 @@ peridot_k8s(
     name = "apollostarter",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = [
         "//ci",
     ],
diff --git a/apollo/cmd/apollostarter/ci/Chart.yaml b/apollo/cmd/apollostarter/ci/Chart.yaml
new file mode 100644
index 00000000..7611f47c
--- /dev/null
+++ b/apollo/cmd/apollostarter/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: apollostarter
+description: Helm chart for apollostarter
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/apollo/cmd/apollostarter/ci/values.yaml b/apollo/cmd/apollostarter/ci/values.yaml
new file mode 100644
index 00000000..f5e3403f
--- /dev/null
+++ b/apollo/cmd/apollostarter/ci/values.yaml
@@ -0,0 +1 @@
+temporalHostPort: workflow-temporal-frontend.workflow.svc.cluster.local:7233
diff --git a/apollo/cmd/apolloworker/ci/BUILD.bazel b/apollo/cmd/apolloworker/ci/BUILD.bazel
index be52c68d..bcf52c9f 100644
--- a/apollo/cmd/apolloworker/ci/BUILD.bazel
+++ b/apollo/cmd/apolloworker/ci/BUILD.bazel
@@ -12,6 +12,8 @@ peridot_k8s(
     name = "apolloworker",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = [
         "//ci",
     ],
diff --git a/apollo/cmd/apolloworker/ci/Chart.yaml b/apollo/cmd/apolloworker/ci/Chart.yaml
new file mode 100644
index 00000000..a48eb17e
--- /dev/null
+++ b/apollo/cmd/apolloworker/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: apolloworker
+description: Helm chart for apolloworker
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/apollo/cmd/apolloworker/ci/values.yaml b/apollo/cmd/apolloworker/ci/values.yaml
new file mode 100644
index 00000000..f5e3403f
--- /dev/null
+++ b/apollo/cmd/apolloworker/ci/values.yaml
@@ -0,0 +1 @@
+temporalHostPort: workflow-temporal-frontend.workflow.svc.cluster.local:7233
diff --git a/ci/temporal.jsonnet b/ci/temporal.jsonnet
index 89988e3b..feb6033f 100644
--- a/ci/temporal.jsonnet
+++ b/ci/temporal.jsonnet
@@ -1,7 +1,9 @@
 local utils = import 'ci/utils.jsonnet';
 
 {
-  hostport: if utils.local_image then 'temporal-frontend.default.svc.cluster.local:7233' else 'workflow-temporal-frontend.workflow.svc.cluster.local:7233',
+  hostport: if utils.local_image then 'temporal-frontend.default.svc.cluster.local:7233'
+            else if utils.helm_mode then '{{ .Values.temporalHostPort }}'
+            else 'workflow-temporal-frontend.workflow.svc.cluster.local:7233',
   kube_env(prefix): [
     {
       name: '%s_TEMPORAL_HOSTPORT' % prefix,
diff --git a/obsidian/cmd/v1/obsidian/ci/BUILD.bazel b/obsidian/cmd/v1/obsidian/ci/BUILD.bazel
index bd8ca516..de77ed8c 100644
--- a/obsidian/cmd/v1/obsidian/ci/BUILD.bazel
+++ b/obsidian/cmd/v1/obsidian/ci/BUILD.bazel
@@ -15,5 +15,7 @@ peridot_k8s(
     name = "obsidian",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/obsidian/cmd/v1/obsidian/ci/Chart.yaml b/obsidian/cmd/v1/obsidian/ci/Chart.yaml
new file mode 100644
index 00000000..6dac7e30
--- /dev/null
+++ b/obsidian/cmd/v1/obsidian/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: obsidian
+description: Helm chart for obsidian
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/obsidian/cmd/v1/obsidian/ci/values.yaml b/obsidian/cmd/v1/obsidian/ci/values.yaml
new file mode 100644
index 00000000..724e8ce5
--- /dev/null
+++ b/obsidian/cmd/v1/obsidian/ci/values.yaml
@@ -0,0 +1,3 @@
+# Ports under requires ingressHost to be set during deploy
+http:
+  ingressHost: null
diff --git a/obsidian/ui/BUILD b/obsidian/ui/BUILD
index be0b9d19..2032f7e2 100644
--- a/obsidian/ui/BUILD
+++ b/obsidian/ui/BUILD
@@ -54,5 +54,7 @@ peridot_k8s(
     name = "obsidian-frontend",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_BASE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/obsidian/ui/Chart.yaml b/obsidian/ui/Chart.yaml
new file mode 100644
index 00000000..71418447
--- /dev/null
+++ b/obsidian/ui/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: obsidian-frontend
+description: Helm chart for Obsidian frontend
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/obsidian/ui/values.yaml b/obsidian/ui/values.yaml
new file mode 100644
index 00000000..724e8ce5
--- /dev/null
+++ b/obsidian/ui/values.yaml
@@ -0,0 +1,3 @@
+# Ports under requires ingressHost to be set during deploy
+http:
+  ingressHost: null
diff --git a/peridot/cmd/v1/keykeeper/ci/BUILD.bazel b/peridot/cmd/v1/keykeeper/ci/BUILD.bazel
index b4c44bee..fe6fb23b 100644
--- a/peridot/cmd/v1/keykeeper/ci/BUILD.bazel
+++ b/peridot/cmd/v1/keykeeper/ci/BUILD.bazel
@@ -12,5 +12,7 @@ peridot_k8s(
     name = "keykeeper",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/peridot/cmd/v1/keykeeper/ci/Chart.yaml b/peridot/cmd/v1/keykeeper/ci/Chart.yaml
new file mode 100644
index 00000000..e902c661
--- /dev/null
+++ b/peridot/cmd/v1/keykeeper/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: keykeeper
+description: Helm chart for keykeeper
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/peridot/cmd/v1/keykeeper/ci/values.yaml b/peridot/cmd/v1/keykeeper/ci/values.yaml
new file mode 100644
index 00000000..bd5b26e5
--- /dev/null
+++ b/peridot/cmd/v1/keykeeper/ci/values.yaml
@@ -0,0 +1,9 @@
+temporalHostPort: workflow-temporal-frontend.workflow.svc.cluster.local:7233
+
+# Set if not AWS S3 (example: Minio)
+s3Endpoint: null
+s3DisableSsl: false
+s3ForcePathStyle: false
+s3Region: us-east-2
+awsRegion: us-east-2
+s3Bucket: resf-peridot-prod
diff --git a/peridot/cmd/v1/peridotephemeral/ci/BUILD.bazel b/peridot/cmd/v1/peridotephemeral/ci/BUILD.bazel
index e8d31441..c717514e 100644
--- a/peridot/cmd/v1/peridotephemeral/ci/BUILD.bazel
+++ b/peridot/cmd/v1/peridotephemeral/ci/BUILD.bazel
@@ -12,6 +12,7 @@ peridot_k8s(
     name = "peridotephemeral",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE_CUSTOM,
+    chart_yaml = "Chart.yaml",
     dependent_push = select({
         "//platforms:x86_64": [
             "//peridot/cmd/v1/peridotbuilder/ci:peridotbuilder_amd64_container",
@@ -29,6 +30,7 @@ peridot_k8s(
             "//peridot/cmd/v1/peridotbuilder/ci:peridotbuilder_ppc64le_container",
         ],
     }),
+    values_yaml = "values.yaml",
     deps = [
         "//ci",
     ],
diff --git a/peridot/cmd/v1/peridotephemeral/ci/Chart.yaml b/peridot/cmd/v1/peridotephemeral/ci/Chart.yaml
new file mode 100644
index 00000000..aec0e401
--- /dev/null
+++ b/peridot/cmd/v1/peridotephemeral/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: peridotephemeral
+description: Helm chart for peridotephemeral
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/peridot/cmd/v1/peridotephemeral/ci/values.yaml b/peridot/cmd/v1/peridotephemeral/ci/values.yaml
new file mode 100644
index 00000000..6d041ac4
--- /dev/null
+++ b/peridot/cmd/v1/peridotephemeral/ci/values.yaml
@@ -0,0 +1,32 @@
+# These default to values in deploy.jsonnet (automatically set by resfdeploy)
+builderOciImageX8664: null
+builderOciImageAarch64: null
+builderOciImageS390x: null
+builderOciImagePpc64le: null
+
+imagePullSecret: null
+
+# Set if not AWS S3 (example: Minio)
+s3Endpoint: null
+s3DisableSsl: false
+s3ForcePathStyle: false
+s3Region: us-east-2
+awsRegion: us-east-2
+s3Bucket: resf-peridot-prod
+
+# Set to true if your cluster can emulate using qemu (example: Docker Desktop on Mac)
+k8sSupportsCrossPlatformNoAffinity: false
+
+# Set to contact services in another cluster (Example: from extarches to main)
+yumrepofsHttpEndpointOverride: null
+temporalHostPort: null
+
+# Provision only mode doesn't take on any "real" work other than provision and destroying workers
+# This is set to true for extarches site
+provisionOnly: false
+
+site: normal
+
+# AWS credentials for external sites (non-AWS sites)
+awsAccessKeyId: null
+awsSecretAccessKey: null
diff --git a/peridot/cmd/v1/yumrepofs/ci/BUILD.bazel b/peridot/cmd/v1/yumrepofs/ci/BUILD.bazel
index bb2938dc..d637e7bd 100644
--- a/peridot/cmd/v1/yumrepofs/ci/BUILD.bazel
+++ b/peridot/cmd/v1/yumrepofs/ci/BUILD.bazel
@@ -12,5 +12,7 @@ peridot_k8s(
     name = "yumrepofs",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/peridot/cmd/v1/yumrepofs/ci/Chart.yaml b/peridot/cmd/v1/yumrepofs/ci/Chart.yaml
new file mode 100644
index 00000000..f4d14fee
--- /dev/null
+++ b/peridot/cmd/v1/yumrepofs/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: yumrepofs
+description: Helm chart for yumrepofs
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/peridot/cmd/v1/yumrepofs/ci/values.yaml b/peridot/cmd/v1/yumrepofs/ci/values.yaml
new file mode 100644
index 00000000..783ecc10
--- /dev/null
+++ b/peridot/cmd/v1/yumrepofs/ci/values.yaml
@@ -0,0 +1,10 @@
+# Set if not AWS S3 (example: Minio)
+s3Endpoint: null
+s3DisableSsl: false
+s3ForcePathStyle: false
+s3Region: us-east-2
+awsRegion: us-east-2
+s3Bucket: resf-peridot-prod
+
+# Role to assume for S3 pre-signed URLs
+s3AssumeRole: null
diff --git a/peridot/cmd/v1/yumrepofsupdater/ci/BUILD.bazel b/peridot/cmd/v1/yumrepofsupdater/ci/BUILD.bazel
index 9034f05a..94363e1f 100644
--- a/peridot/cmd/v1/yumrepofsupdater/ci/BUILD.bazel
+++ b/peridot/cmd/v1/yumrepofsupdater/ci/BUILD.bazel
@@ -12,5 +12,7 @@ peridot_k8s(
     name = "yumrepofsupdater",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_MIGRATE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/peridot/cmd/v1/yumrepofsupdater/ci/Chart.yaml b/peridot/cmd/v1/yumrepofsupdater/ci/Chart.yaml
new file mode 100644
index 00000000..34d3889e
--- /dev/null
+++ b/peridot/cmd/v1/yumrepofsupdater/ci/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: yumrepofsupdater
+description: Helm chart for yumrepofsupdater
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/peridot/cmd/v1/yumrepofsupdater/ci/values.yaml b/peridot/cmd/v1/yumrepofsupdater/ci/values.yaml
new file mode 100644
index 00000000..1addf2bd
--- /dev/null
+++ b/peridot/cmd/v1/yumrepofsupdater/ci/values.yaml
@@ -0,0 +1,7 @@
+# Set if not AWS S3 (example: Minio)
+s3Endpoint: null
+s3DisableSsl: false
+s3ForcePathStyle: false
+s3Region: us-east-2
+awsRegion: us-east-2
+s3Bucket: resf-peridot-prod
diff --git a/peridot/ui/BUILD b/peridot/ui/BUILD
index 81c8a3c3..2c6d60ba 100644
--- a/peridot/ui/BUILD
+++ b/peridot/ui/BUILD
@@ -55,5 +55,7 @@ peridot_k8s(
     name = "peridot-frontend",
     src = "deploy.jsonnet",
     outs = RESFDEPLOY_OUTS_BASE,
+    chart_yaml = "Chart.yaml",
+    values_yaml = "values.yaml",
     deps = ["//ci"],
 )
diff --git a/peridot/ui/Chart.yaml b/peridot/ui/Chart.yaml
new file mode 100644
index 00000000..7395e1d0
--- /dev/null
+++ b/peridot/ui/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: peridot-frontend
+description: Helm chart for Peridot frontend
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/peridot/ui/values.yaml b/peridot/ui/values.yaml
new file mode 100644
index 00000000..724e8ce5
--- /dev/null
+++ b/peridot/ui/values.yaml
@@ -0,0 +1,3 @@
+# Ports under requires ingressHost to be set during deploy
+http:
+  ingressHost: null