From 47a4c9c95ae7af69d40e2ab6c2aac88beb44b5d0 Mon Sep 17 00:00:00 2001 From: aajimal Date: Thu, 6 Jun 2024 15:44:32 -0700 Subject: [PATCH 1/3] Use latest tag for cronjob --- charts/spamooor-cronjobs/Chart.yaml | 2 +- charts/spamooor-cronjobs/values.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/spamooor-cronjobs/Chart.yaml b/charts/spamooor-cronjobs/Chart.yaml index 5314b73..4211ea5 100644 --- a/charts/spamooor-cronjobs/Chart.yaml +++ b/charts/spamooor-cronjobs/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 0.1.0 description: A Helm chart for Kubernetes name: spamooor-cronjobs type: application -version: 0.1.2 +version: 0.1.3 maintainers: - name: bharath-123 diff --git a/charts/spamooor-cronjobs/values.yaml b/charts/spamooor-cronjobs/values.yaml index 933518e..514f456 100644 --- a/charts/spamooor-cronjobs/values.yaml +++ b/charts/spamooor-cronjobs/values.yaml @@ -8,7 +8,7 @@ jobs: fsGroup: 2000 image: repository: ghcr.io/astriaorg/spamooor - tag: pr-12 + tag: latest imagePullPolicy: Always schedule: "*/20 * * * *" command: ["/app/spamooor"] @@ -46,7 +46,7 @@ jobs: fsGroup: 2000 image: repository: ghcr.io/astriaorg/spamooor - tag: pr-12 + tag: latest imagePullPolicy: Always schedule: "*/15 * * * *" command: ["/app/spamooor"] @@ -84,7 +84,7 @@ jobs: fsGroup: 2000 image: repository: ghcr.io/astriaorg/spamooor - tag: pr-12 + tag: latest imagePullPolicy: Always # run every 10mins schedule: "*/25 * * * *" @@ -123,7 +123,7 @@ jobs: fsGroup: 2000 image: repository: ghcr.io/astriaorg/spamooor - tag: pr-12 + tag: latest imagePullPolicy: Always schedule: "*/30 * * * *" command: ["/app/spamooor"] From 27cea192c97494a520335967ed78d71e0b745574 Mon Sep 17 00:00:00 2001 From: aajimal Date: Thu, 6 Jun 2024 16:15:45 -0700 Subject: [PATCH 2/3] Update argocd app to reference master --- argocd/app/app-spamooor.yaml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/argocd/app/app-spamooor.yaml b/argocd/app/app-spamooor.yaml index e4c1d9c..d9c4446 100644 --- a/argocd/app/app-spamooor.yaml +++ b/argocd/app/app-spamooor.yaml @@ -1,7 +1,9 @@ +# Source https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/application.yaml apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: spamooor + namespace: argocd spec: project: default destination: @@ -9,8 +11,28 @@ spec: namespace: spamooor-cronjobs source: repoURL: https://github.com/astriaorg/spamooor.git - targetRevision: helm-chart + targetRevision: master path: charts/spamooor-cronjobs helm: valueFiles: - - values.yaml \ No newline at end of file + - values.yaml + # parameters: # Paramters to override default values in values.yaml + # - name: jobs.erctxsjob.image.tag + # value: latest + # - name: jobs.eoatxsjob.image.tag + # value: latest + # - name: jobs.univ2txsjob.image.tag + # value: latest + # - name: jobs.gasburnertxsjob.image.tag + # value: latest + syncPolicy: + automated: + prune: true + allowEmpty: true + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: + argocd.argoproj.io/instance: spamooor + annotations: + argocd.argoproj.io/tracking-id: spamooor/Namespace:spamooor-cronjobs From a455ccb2708113dfa1e6c810fa25aa8066ccfa7d Mon Sep 17 00:00:00 2001 From: aajimal Date: Thu, 6 Jun 2024 16:16:38 -0700 Subject: [PATCH 3/3] Update argocd appset to use PR image and namespace --- argocd/appset/spamooor-applicationset.yaml | 43 +++++++++++++--------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/argocd/appset/spamooor-applicationset.yaml b/argocd/appset/spamooor-applicationset.yaml index d719db6..184643c 100644 --- a/argocd/appset/spamooor-applicationset.yaml +++ b/argocd/appset/spamooor-applicationset.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: pr-spamooor + name: spamooor-preview namespace: argocd spec: goTemplate: true @@ -32,27 +32,34 @@ spec: requeueAfterSeconds: 60 template: metadata: - name: pr-{{.number}}-spamooor + name: spamooor-pr-{{.number}} spec: destination: server: https://kubernetes.default.svc - namespace: pr-{{.number}}-spamooor + namespace: spamooor-pr-{{.number}} project: default - sources: - - repoURL: https://github.com/astriaorg/spamooor.git - targetRevision: 'pull/{{.number}}/head' # '{{.head_sha}}' - path: charts/spamooor-cronjobs - helm: - # https://argo-cd.readthedocs.io/en/stable/user-guide/helm/#helm-value-precedence - # Order of precedence is as follows: - # lowest -> valueFiles - # -> values - # -> valuesObject - # highest -> parameters - - valueFiles: - - values.yaml - + source: + repoURL: https://github.com/astriaorg/spamooor.git + targetRevision: 'pull/{{.number}}/head' # '{{.head_sha}}' + path: charts/spamooor-cronjobs + helm: + # https://argo-cd.readthedocs.io/en/stable/user-guide/helm/#helm-value-precedence + # Order of precedence is as follows: + # lowest -> valueFiles + # -> values + # -> valuesObject + # highest -> parameters + valueFiles: + - values.yaml + parameters: # Paramters to override default values in values.yaml + - name: jobs.erctxsjob.image.tag + value: pr-{{.number}} + - name: jobs.eoatxsjob.image.tag + value: pr-{{.number}} + - name: jobs.univ2txsjob.image.tag + value: pr-{{.number}} + - name: jobs.gasburnertxsjob.image.tag + value: pr-{{.number}} syncPolicy: automated: prune: true