From 62cc38521aa1913513a69b267b0174f922f38cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Gonz=C3=A1lez?= Date: Thu, 22 Sep 2022 10:59:23 -0400 Subject: [PATCH] fix: use the correct init command for forum and add missing annotations --- .../kustomized/tutor13/extensions/drydock-jobs/forum.yml | 9 ++------- .../kustomized/tutor13/extensions/drydock-jobs/notes.yml | 4 ++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/forum.yml b/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/forum.yml index ab314303..a53d8fb2 100644 --- a/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/forum.yml +++ b/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/forum.yml @@ -22,7 +22,8 @@ spec: - -e - -c - 'bundle exec rake search:initialize - bundle exec rake search:rebuild_index' + + bundle exec rake search:rebuild_indices' env: - name: SEARCH_SERVER value: "{{ ELASTICSEARCH_SCHEME }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}" @@ -34,10 +35,4 @@ spec: value: "{{ MONGODB_PORT }}" - name: MONGODB_DATABASE value: "{{ FORUM_MONGODB_DATABASE }}" - - name: MONGOHQ_URL - value: "mongodb://$(MONGODB_AUTH)$(MONGODB_HOST):$(MONGODB_PORT)/$(MONGODB_DATABASE)" - - name: SEARCH_SERVER_ES7 - value: "$(SEARCH_SERVER)" - - name: MONGOID_AUTH_MECH - value: ":scram" {%- endif %} diff --git a/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/notes.yml b/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/notes.yml index fb5c20b3..971656a7 100644 --- a/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/notes.yml +++ b/drydock/templates/kustomized/tutor13/extensions/drydock-jobs/notes.yml @@ -33,6 +33,8 @@ metadata: app.kubernetes.io/component: job annotations: argocd.argoproj.io/sync-wave: "3" + argocd.argoproj.io/hook: Sync + argocd.argoproj.io/hook-delete-policy: HookSucceeded spec: ttlSecondsAfterFinished: 100 template: @@ -63,6 +65,8 @@ metadata: app.kubernetes.io/component: job annotations: argocd.argoproj.io/sync-wave: "3" + argocd.argoproj.io/hook: Sync + argocd.argoproj.io/hook-delete-policy: HookSucceeded spec: ttlSecondsAfterFinished: 100 template: