From e8b384e2f69551ff914b7652a02e6fdcafb3783f Mon Sep 17 00:00:00 2001 From: Trevor Royer Date: Wed, 29 May 2024 16:38:20 -0600 Subject: [PATCH] add waves --- .../base/create-bucket-job.yaml | 17 ----------------- .../base/create-bucket-rbac.yaml | 17 ----------------- .../create-bucket-job/base/kustomization.yaml | 5 ++--- .../upload-model-job/base/kustomization.yaml | 4 ++-- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 components/apps/create-bucket-job/base/create-bucket-rbac.yaml diff --git a/components/apps/create-bucket-job/base/create-bucket-job.yaml b/components/apps/create-bucket-job/base/create-bucket-job.yaml index ddb61f19..f8be22be 100644 --- a/components/apps/create-bucket-job/base/create-bucket-job.yaml +++ b/components/apps/create-bucket-job/base/create-bucket-job.yaml @@ -28,20 +28,3 @@ spec: configMap: name: create-bucket restartPolicy: Never - # initContainers: - # - args: - # - -ec - # - |- - # echo -n 'Waiting for minio root user secret' - # while ! oc get secret single-model-serving-ds-connection 2>/dev/null | grep -qF single-model-serving-ds-connection; do - # echo -n . - # sleep 5 - # done; echo - # command: - # - /bin/bash - # image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest - # imagePullPolicy: IfNotPresent - # name: wait-for-minio - # restartPolicy: Never - # serviceAccount: create-bucket - # serviceAccountName: create-bucket diff --git a/components/apps/create-bucket-job/base/create-bucket-rbac.yaml b/components/apps/create-bucket-job/base/create-bucket-rbac.yaml deleted file mode 100644 index 6e9ec611..00000000 --- a/components/apps/create-bucket-job/base/create-bucket-rbac.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: create-bucket ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: create-bucket-edit -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: edit -subjects: - - kind: ServiceAccount - name: create-bucket diff --git a/components/apps/create-bucket-job/base/kustomization.yaml b/components/apps/create-bucket-job/base/kustomization.yaml index d3dda761..c71dc547 100644 --- a/components/apps/create-bucket-job/base/kustomization.yaml +++ b/components/apps/create-bucket-job/base/kustomization.yaml @@ -1,12 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# commonAnnotations: -# argocd.argoproj.io/hook: PreSync +commonAnnotations: + argocd.argoproj.io/sync-wave: "-100" resources: - create-bucket-job.yaml - # - create-bucket-rbac.yaml generatorOptions: disableNameSuffixHash: true diff --git a/components/apps/upload-model-job/base/kustomization.yaml b/components/apps/upload-model-job/base/kustomization.yaml index 1d537549..e24070db 100644 --- a/components/apps/upload-model-job/base/kustomization.yaml +++ b/components/apps/upload-model-job/base/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# commonAnnotations: -# argocd.argoproj.io/hook: PreSync +commonAnnotations: + argocd.argoproj.io/sync-wave: "-90" resources: - upload-model-job.yaml