Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

k8s: Remove Argo managed services from helmfile #1840

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/generate-values
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RELEASE="$2"
# absolute path of the wbaas-deploy repository
ROOT=$(realpath $(dirname $(realpath $BASH_SOURCE))/..)
OUTPUT_TEMPLATE="${ROOT}/k8s/argocd/${ENVIRONMENT}/${RELEASE}.values.yaml"
HELMFILE="k8s/helmfile/helmfile.yaml"
HELMFILE="k8s/helmfile/only-for-argo-value-generation.yaml"
TMP_HELMFILE="$(dirname ${HELMFILE})/.tmp_helmfile.$(mktemp -u XXXXXX).yaml"

if [[ -n "$3" ]]; then
Expand Down
12 changes: 0 additions & 12 deletions k8s/helmfile/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,6 @@ releases:
- forceSSL: {{ .Values.forceSSL | toYaml }}
- tls: {{ .Values.tls | toYaml }}

- name: api
chart: wbstack/api
version: "0.32.0"
namespace: default
<<: *default_release

- name: ui
namespace: default
chart: wbstack/ui
version: 0.3.1
<<: *default_release

- name: mediawiki-139
namespace: default
chart: wbstack/mediawiki
Expand Down
61 changes: 61 additions & 0 deletions k8s/helmfile/only-for-argo-value-generation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
repositories:
- name: wbstack
url: https://wbstack.github.io/charts
- name: bitnami
url: https://charts.bitnami.com/bitnami
- name: bitnami-legacy
# yamllint disable-line rule:line-length
url: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
- name: cetic
url: https://cetic.github.io/helm-charts
- name: codecentric
url: https://codecentric.github.io/helm-charts
- name: ingress-nginx
url: https://kubernetes.github.io/ingress-nginx
- name: prometheus-community
url: https://prometheus-community.github.io/helm-charts
- name: istio
url: https://istio-release.storage.googleapis.com/charts
- name: minio
url: https://charts.min.io

environments:
default:
kubeContext: INVALID-ENVIRONMENT
production:
kubeContext: gke_wikibase-cloud_europe-west3-a_wbaas-3
values:
- ./env/production/base.yaml
- ./env/production/private.yaml
staging:
kubeContext: gke_wikibase-cloud_europe-west3-a_wbaas-2
values:
- ./env/staging/base.yaml
- ./env/staging/private.yaml
local:
kubeContext: minikube-wbaas
values:
- ./env/local/base.yaml
- ./env/local/private.yaml

---

templates:
default: &default_release
missingFileHandler: Error
values:
- env/production/{{`{{ .Release.Name }}`}}.values.yaml.gotmpl
- env/{{`{{ .Environment.Name }}`}}/{{`{{ .Release.Name }}`}}.values.yaml.gotmpl

releases:
- name: api
chart: wbstack/api
version: "0.32.0"
namespace: default
<<: *default_release

- name: ui
namespace: default
chart: wbstack/ui
version: 0.3.1
<<: *default_release