From 7e89085808d3e602d4f8cf916e630dd63ae46bd8 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Fri, 31 May 2024 14:23:18 +0200
Subject: [PATCH] templates/openshift/composer: remove maintenance cronjob

This is now deployed from a separate tempate.
---
 templates/openshift/composer.yml | 161 -------------------------------
 1 file changed, 161 deletions(-)

diff --git a/templates/openshift/composer.yml b/templates/openshift/composer.yml
index 9f3045e7c..db5ea22ac 100644
--- a/templates/openshift/composer.yml
+++ b/templates/openshift/composer.yml
@@ -266,132 +266,6 @@ objects:
       jwt_acl_file = "${COMPOSER_CONFIG_DIR}/acl.yml"
       jwt_tenant_provider_fields = ["rh-org-id", "account_id"]
       worker_heartbeat_timeout = "5m"
-- apiVersion: batch/v1
-  kind: CronJob
-  metadata:
-    labels:
-      service: image-builder
-    name: composer-maintenance
-  spec:
-    # run maintenance job at midnight
-    schedule: 0 0 * * *
-    concurrencyPolicy: Forbid
-    # don't run if the job doesn't get scheduled within 30 minutes
-    startingDeadlineSeconds: 1800
-    jobTemplate:
-      spec:
-        template:
-          spec:
-            serviceAccountName: image-builder
-            restartPolicy: Never
-            containers:
-            - image: "${MAINTENANCE_IMAGE_NAME}:${IMAGE_TAG}"
-              name: composer-maintenance
-              resources:
-                requests:
-                  cpu: "${MAINTENANCE_CPU_REQUEST}"
-                  memory: "${MEMORY_REQUEST}"
-                limits:
-                  cpu: "${MAINTENANCE_CPU_LIMIT}"
-                  memory: "${MEMORY_LIMIT}"
-              env:
-              - name: PGHOST
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.host
-              - name: PGPORT
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.port
-              - name: PGDATABASE
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.name
-              - name: PGUSER
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.user
-              - name: PGPASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: composer-db
-                    key: db.password
-              - name: PGSSLMODE
-                value: "${PGSSLMODE}"
-              - name: GCP_AUTH_PROVIDER_X509_CERT_URL
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: auth_provider_x509_cert_url
-              - name: GCP_AUTH_URI
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: auth_uri
-              - name: GCP_CLIENT_EMAIL
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: client_email
-              - name: GCP_CLIENT_ID
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: client_id
-              - name: GCP_CLIENT_X509_CERT_URL
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: client_x509_cert_url
-              - name: GCP_PRIVATE_KEY
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: private_key
-              - name: GCP_PRIVATE_KEY_ID
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: private_key_id
-              - name: GCP_PROJECT_ID
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: project_id
-              - name: GCP_TOKEN_URI
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: token_uri
-              - name: GCP_TYPE
-                valueFrom:
-                  secretKeyRef:
-                    name: gcp-service-account
-                    key: type
-              - name: AWS_ACCESS_KEY_ID
-                valueFrom:
-                  secretKeyRef:
-                    name: aws-account
-                    key: access_key_id
-              - name: AWS_SECRET_ACCESS_KEY
-                valueFrom:
-                  secretKeyRef:
-                    name: aws-account
-                    key: secret_access_key
-              - name: DRY_RUN
-                value: "${MAINTENANCE_DRY_RUN}"
-              - name: ENABLE_AWS_MAINTENANCE
-                value: "${ENABLE_AWS_MAINTENANCE}"
-              - name: ENABLE_GCP_MAINTENANCE
-                value: "${ENABLE_GCP_MAINTENANCE}"
-              - name: ENABLE_DB_MAINTENANCE
-                value: "${ENABLE_DB_MAINTENANCE}"
-              - name: MAX_CONCURRENT_REQUESTS
-                value: "${MAINTENANCE_MAX_CONCURRENT_REQUESTS}"
 
 parameters:
   - description: composer image name
@@ -451,47 +325,12 @@ parameters:
   - name: FLUENTD_CPU_LIMIT
     description: CPU limit per container
     value: "100m"
-  - name: MAINTENANCE_CPU_REQUEST
-    description: CPU request per container
-    value: "50m"
-  - name: MAINTENANCE_CPU_LIMIT
-    description: CPU limit per container
-    value: "100m"
   - name: MEMORY_REQUEST
     description: Memory request per container
     value: "256Mi"
   - name: MEMORY_LIMIT
     description: Memory limit per container
     value: "512Mi"
-  # maintenance image variables
-  - description: composer-maintenance image name
-    name: MAINTENANCE_IMAGE_NAME
-    value: quay.io/app-sre/composer-maintenance
-    required: true
-  - description: composer-maintenance dry run
-    name: MAINTENANCE_DRY_RUN
-    # don't change this value, overwrite it in app-interface for a specific namespace
-    value: "true"
-    required: true
-  - description: Enable AWS maintenance
-    name: ENABLE_AWS_MAINTENANCE
-    # don't change this value, overwrite it in app-interface for a specific namespace
-    value: "false"
-    required: true
-  - description: Enable GPC maintenance
-    name: ENABLE_GCP_MAINTENANCE
-    # don't change this value, overwrite it in app-interface for a specific namespace
-    value: "false"
-    required: true
-  - description: Enable DB maintenance
-    name: ENABLE_DB_MAINTENANCE
-    # don't change this value, overwrite it in app-interface for a specific namespace
-    value: "false"
-    required: true
-  - description: composer-maintenance max concurrent requests
-    name: MAINTENANCE_MAX_CONCURRENT_REQUESTS
-    value: "10"
-    required: true
   - description: Splunk HTTP Event Collector port
     name: SPLUNK_HEC_PORT
     value: "443"