From d44252b18241193259055ca39056d52461b5b218 Mon Sep 17 00:00:00 2001 From: Adam Cmiel Date: Wed, 29 May 2024 11:28:09 +0200 Subject: [PATCH] Prune konflux-ci/pull-request-builds STONEBLD-2339 And stop pruning redhat-appstudio-tekton-catalog/pull-request-builds. After https://github.com/konflux-ci/build-definitions/pull/1041, nothing will be pushed there anymore. Signed-off-by: Adam Cmiel --- ...x-ci-pull-request-builds-pruner-cronjob.yaml} | 16 ++++++++-------- ...lux-ci-pull-request-builds-pruner-token.yaml} | 6 +++--- .../stone-prd-rh01/resources/kustomization.yaml | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) rename components/image-controller/production/stone-prd-rh01/resources/{redhat-appstudio-tekton-catalog-pr-cronjob.yaml => konflux-ci-pull-request-builds-pruner-cronjob.yaml} (68%) rename components/image-controller/production/stone-prd-rh01/resources/{redhat-appstudio-tekton-catalog-pr-token.yaml => konflux-ci-pull-request-builds-pruner-token.yaml} (68%) diff --git a/components/image-controller/production/stone-prd-rh01/resources/redhat-appstudio-tekton-catalog-pr-cronjob.yaml b/components/image-controller/production/stone-prd-rh01/resources/konflux-ci-pull-request-builds-pruner-cronjob.yaml similarity index 68% rename from components/image-controller/production/stone-prd-rh01/resources/redhat-appstudio-tekton-catalog-pr-cronjob.yaml rename to components/image-controller/production/stone-prd-rh01/resources/konflux-ci-pull-request-builds-pruner-cronjob.yaml index b1d888b764b..513a5e803f5 100644 --- a/components/image-controller/production/stone-prd-rh01/resources/redhat-appstudio-tekton-catalog-pr-cronjob.yaml +++ b/components/image-controller/production/stone-prd-rh01/resources/konflux-ci-pull-request-builds-pruner-cronjob.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: redhat-appstudio-tekton-catalog-pr-cronjob + name: konflux-ci-pull-request-builds-pruner-cronjob spec: schedule: "0 1 * * *" concurrencyPolicy: Forbid @@ -10,21 +10,21 @@ spec: template: spec: containers: - - name: redhat-appstudio-tekton-catalog-pr-pruner + - name: konflux-ci-pull-request-builds-pruner image: registry.redhat.io/rhel8/python-39:1-120.1684740828 env: - name: QUAY_TOKEN valueFrom: secretKeyRef: - name: redhat-appstudio-tekton-catalog-pr-token + name: konflux-ci-pull-request-builds-pruner-token key: quaytoken imagePullPolicy: IfNotPresent command: - /bin/bash - '-c' - - python /image-pruner/prune_images.py --namespace=redhat-appstudio-tekton-catalog --repo-name=pull-request-builds + - python /image-pruner/prune_images.py --namespace=konflux-ci --repo-name=pull-request-builds volumeMounts: - - name: redhat-appstudio-tekton-catalog-pr-volume + - name: konflux-ci-pull-request-builds-pruner-volume mountPath: /image-pruner resources: limits: @@ -39,9 +39,9 @@ spec: securityContext: runAsNonRoot: true volumes: - - name: redhat-appstudio-tekton-catalog-pr-volume + - name: konflux-ci-pull-request-builds-pruner-volume configMap: name: single-image-pruner-configmap - - name: redhat-appstudio-tekton-catalog-pr-token + - name: konflux-ci-pull-request-builds-pruner-token secret: - secretName: redhat-appstudio-tekton-catalog-pr-token + secretName: konflux-ci-pull-request-builds-pruner-token diff --git a/components/image-controller/production/stone-prd-rh01/resources/redhat-appstudio-tekton-catalog-pr-token.yaml b/components/image-controller/production/stone-prd-rh01/resources/konflux-ci-pull-request-builds-pruner-token.yaml similarity index 68% rename from components/image-controller/production/stone-prd-rh01/resources/redhat-appstudio-tekton-catalog-pr-token.yaml rename to components/image-controller/production/stone-prd-rh01/resources/konflux-ci-pull-request-builds-pruner-token.yaml index 4a75be79670..8e0199b6b7f 100644 --- a/components/image-controller/production/stone-prd-rh01/resources/redhat-appstudio-tekton-catalog-pr-token.yaml +++ b/components/image-controller/production/stone-prd-rh01/resources/konflux-ci-pull-request-builds-pruner-token.yaml @@ -1,14 +1,14 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: redhat-appstudio-tekton-catalog-pr-token + name: konflux-ci-pull-request-builds-pruner-token annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: "-1" spec: dataFrom: - extract: - key: production/build/redhat-appstudio-tekton-catalog-pr-token + key: production/build/konflux-ci-pull-request-builds-pruner-token refreshInterval: 20h secretStoreRef: kind: ClusterSecretStore @@ -16,4 +16,4 @@ spec: target: creationPolicy: Owner deletionPolicy: Delete - name: redhat-appstudio-tekton-catalog-pr-token + name: konflux-ci-pull-request-builds-pruner-token diff --git a/components/image-controller/production/stone-prd-rh01/resources/kustomization.yaml b/components/image-controller/production/stone-prd-rh01/resources/kustomization.yaml index 72dd7f0c0fd..4a0b01b9ae0 100644 --- a/components/image-controller/production/stone-prd-rh01/resources/kustomization.yaml +++ b/components/image-controller/production/stone-prd-rh01/resources/kustomization.yaml @@ -2,9 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - redhat-appstudio-pr-token.yaml -- redhat-appstudio-tekton-catalog-pr-token.yaml - redhat-appstudio-pr-cronjob.yaml -- redhat-appstudio-tekton-catalog-pr-cronjob.yaml +- konflux-ci-pull-request-builds-pruner-token.yaml +- konflux-ci-pull-request-builds-pruner-cronjob.yaml configMapGenerator: - name: single-image-pruner-configmap files: