diff --git a/apollo/cmd/apollo/ci/BUILD.bazel b/apollo/cmd/apollo/ci/BUILD.bazel index 94bd2e0..410353c 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 0000000..e4fc115 --- /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 0000000..724e8ce --- /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 a01c778..7b4f2dc 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 0000000..7611f47 --- /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 0000000..f5e3403 --- /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 be52c68..bcf52c9 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 0000000..a48eb17 --- /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 0000000..f5e3403 --- /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 89988e3..feb6033 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 bd8ca51..de77ed8 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 0000000..6dac7e3 --- /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 0000000..724e8ce --- /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 be0b9d1..2032f7e 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 0000000..7141844 --- /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 0000000..724e8ce --- /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 b4c44be..fe6fb23 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 0000000..e902c66 --- /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 0000000..bd5b26e --- /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 e8d3144..c717514 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 0000000..aec0e40 --- /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 0000000..6d041ac --- /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 bb2938d..d637e7b 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 0000000..f4d14fe --- /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 0000000..783ecc1 --- /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 9034f05..94363e1 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 0000000..34d3889 --- /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 0000000..1addf2b --- /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 81c8a3c..2c6d60b 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 0000000..7395e1d --- /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 0000000..724e8ce --- /dev/null +++ b/peridot/ui/values.yaml @@ -0,0 +1,3 @@ +# Ports under requires ingressHost to be set during deploy +http: + ingressHost: null