From 008983b0803d7b197baec80d753a092f883ea512 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Fri, 3 Jul 2026 17:10:40 +0200 Subject: [PATCH] openshift-logging: Remove unused Loki versions --- .../loki/openshift-loki-upstream-v3.5.7.yaml | 51 ------- .../loki/openshift-loki-upstream-v3.7.2.yaml | 46 ------ ...hift-loki-upstream-v3.5.7-postsubmits.yaml | 65 -------- ...shift-loki-upstream-v3.5.7-presubmits.yaml | 142 ------------------ ...hift-loki-upstream-v3.7.2-postsubmits.yaml | 64 -------- ...shift-loki-upstream-v3.7.2-presubmits.yaml | 140 ----------------- 6 files changed, 508 deletions(-) delete mode 100644 ci-operator/config/openshift/loki/openshift-loki-upstream-v3.5.7.yaml delete mode 100644 ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml delete mode 100644 ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-postsubmits.yaml delete mode 100644 ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-presubmits.yaml delete mode 100644 ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml delete mode 100644 ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml diff --git a/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.5.7.yaml b/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.5.7.yaml deleted file mode 100644 index 05a234c652b7d..0000000000000 --- a/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.5.7.yaml +++ /dev/null @@ -1,51 +0,0 @@ -base_images: - base: - name: "4.21" - namespace: ocp - tag: base-rhel9 -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.21 -images: - items: - - additional_architectures: - - arm64 - dockerfile_path: Dockerfile.ocp - from: base - to: loki - - additional_architectures: - - arm64 - dockerfile_path: Dockerfile.promtail.ocp - from: base - to: promtail -promotion: - to: - - namespace: logging - tag: v3.5.7 -releases: - latest: - release: - channel: stable - version: "4.21" -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -tests: -- as: test - steps: - test: - - as: unit - commands: GOFLAGS="" make test - from: src - resources: - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: upstream-v3.5.7 - org: openshift - repo: loki diff --git a/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml b/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml deleted file mode 100644 index 1a411f1b2bea6..0000000000000 --- a/ci-operator/config/openshift/loki/openshift-loki-upstream-v3.7.2.yaml +++ /dev/null @@ -1,46 +0,0 @@ -base_images: - base: - name: "4.22" - namespace: ocp - tag: base-rhel9 -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.23 -images: - items: - - additional_architectures: - - arm64 - dockerfile_path: Dockerfile.ocp - from: base - to: loki -promotion: - to: - - namespace: logging - tag: v3.7.2 -releases: - latest: - release: - channel: stable - version: "4.22" -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -tests: -- as: test - steps: - test: - - as: unit - commands: GOFLAGS="" make test - from: src - resources: - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: upstream-v3.7.2 - org: openshift - repo: loki diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-postsubmits.yaml deleted file mode 100644 index 68c198c24b3c2..0000000000000 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-postsubmits.yaml +++ /dev/null @@ -1,65 +0,0 @@ -postsubmits: - openshift/loki: - - agent: kubernetes - always_run: true - branches: - - ^upstream-v3\.5\.7$ - cluster: build05 - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile.ocp - - Dockerfile.promtail.ocp - labels: - capability/arm64: arm64 - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-loki-upstream-v3.5.7-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-presubmits.yaml deleted file mode 100644 index 77fe3641b4913..0000000000000 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.5.7-presubmits.yaml +++ /dev/null @@ -1,142 +0,0 @@ -presubmits: - openshift/loki: - - agent: kubernetes - always_run: true - branches: - - ^upstream-v3\.5\.7$ - - ^upstream-v3\.5\.7- - cluster: build03 - context: ci/prow/images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile.ocp - - Dockerfile.promtail.ocp - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-loki-upstream-v3.5.7-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^upstream-v3\.5\.7$ - - ^upstream-v3\.5\.7- - cluster: build03 - context: ci/prow/test - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile.ocp - - Dockerfile.promtail.ocp - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-loki-upstream-v3.5.7-test - rerun_command: /test test - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=test - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )test,?($|\s.*) diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml deleted file mode 100644 index 7420eb87a9148..0000000000000 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-postsubmits.yaml +++ /dev/null @@ -1,64 +0,0 @@ -postsubmits: - openshift/loki: - - agent: kubernetes - always_run: true - branches: - - ^upstream-v3\.7\.2$ - cluster: build05 - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile.ocp - labels: - capability/arm64: arm64 - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-loki-upstream-v3.7.2-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml deleted file mode 100644 index f938a7453c41f..0000000000000 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.7.2-presubmits.yaml +++ /dev/null @@ -1,140 +0,0 @@ -presubmits: - openshift/loki: - - agent: kubernetes - always_run: true - branches: - - ^upstream-v3\.7\.2$ - - ^upstream-v3\.7\.2- - cluster: build03 - context: ci/prow/images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile.ocp - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-loki-upstream-v3.7.2-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^upstream-v3\.7\.2$ - - ^upstream-v3\.7\.2- - cluster: build03 - context: ci/prow/test - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile.ocp - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-loki-upstream-v3.7.2-test - rerun_command: /test test - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=test - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )test,?($|\s.*)