From a4aaf6f0d026d51115ad5a116f5d2e8c11e83f1b Mon Sep 17 00:00:00 2001 From: apiaseck Date: Sat, 2 Nov 2024 19:25:36 +0100 Subject: [PATCH] fedora-ostree-pruner: Move from deprecated DeploymentConfig to Deployment First try aat move from deprecated DeploymentConfig to Deployment using staging environment. See: https://github.com/jbtrystram/coreos-hackathon/issues/13 --- .../openshift-apps/fedora-ostree-pruner.yml | 7 +++ .../templates/deployment.yml.j2 | 43 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 roles/openshift-apps/fedora-ostree-pruner/templates/deployment.yml.j2 diff --git a/playbooks/openshift-apps/fedora-ostree-pruner.yml b/playbooks/openshift-apps/fedora-ostree-pruner.yml index 89404b35a1..d5e19ae225 100644 --- a/playbooks/openshift-apps/fedora-ostree-pruner.yml +++ b/playbooks/openshift-apps/fedora-ostree-pruner.yml @@ -38,6 +38,13 @@ object_app: fedora-ostree-pruner object_template: deploymentconfig.yml.j2 object_objectname: deploymentconfig.yml + when: env == "production" + + - role: openshift/object + object_app: fedora-ostree-pruner + object_template: deployment.yml.j2 + object_objectname: deployment.yml + when: env == "staging" - role: openshift/object object_app: fedora-ostree-pruner diff --git a/roles/openshift-apps/fedora-ostree-pruner/templates/deployment.yml.j2 b/roles/openshift-apps/fedora-ostree-pruner/templates/deployment.yml.j2 new file mode 100644 index 0000000000..7f4adfab1c --- /dev/null +++ b/roles/openshift-apps/fedora-ostree-pruner/templates/deployment.yml.j2 @@ -0,0 +1,43 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: fedora-ostree-pruner + name: fedora-ostree-pruner + annotations: + image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fedora-ostree-pruner-img:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fedora-ostree-pruner\")].image","paused":false}]' +spec: + replicas: 1 + selector: + matchLabels: + app: fedora-ostree-pruner + strategy: + resources: {} + template: + metadata: + labels: + app: fedora-ostree-pruner + name: fedora-ostree-pruner + spec: + containers: + - name: fedora-ostree-pruner + # sleep infinity is useful for debugging environment issues + # comment out when not debugging + # args: ['/usr/bin/sleep', 'infinity'] + # command: ['/usr/bin/dumb-init'] + volumeMounts: + - name: fedora-ostree-content-volume + mountPath: /mnt/koji + image: "" + imagePullPolicy: IfNotPresent + resources: {} + # The files in the ostree volumes are created with group ownership of 263. + # We need to have 263 in our supplemental groups. See https://pagure.io/releng/issue/8811#comment-629051 + securityContext: + supplementalGroups: [263] + volumes: + - name: fedora-ostree-content-volume + persistentVolumeClaim: + claimName: fedora-ostree-content-volume + restartPolicy: Always