From 1d5588e5abdf2155f23281745a3ed7e68bb5e12a Mon Sep 17 00:00:00 2001 From: apiaseck Date: Fri, 1 Nov 2024 14:08:57 +0100 Subject: [PATCH] coreos-koji-tagger: Move from deprecated DeploymentConfig to Deployment First try at move from deprecated DeploymentConfig to Deployment using staging environment. Using the information related to moving to Deployment as per: https://github.com/jbtrystram/coreos-hackathon/issues/13 See: https://github.com/jbtrystram/coreos-hackathon/issues/13 --- .../openshift-apps/coreos-koji-tagger.yml | 7 ++ .../templates/deployment.yml.j2 | 64 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 roles/openshift-apps/coreos-koji-tagger/templates/deployment.yml.j2 diff --git a/playbooks/openshift-apps/coreos-koji-tagger.yml b/playbooks/openshift-apps/coreos-koji-tagger.yml index 3abf49a8f7..7ae84f8034 100644 --- a/playbooks/openshift-apps/coreos-koji-tagger.yml +++ b/playbooks/openshift-apps/coreos-koji-tagger.yml @@ -62,6 +62,13 @@ object_app: coreos-koji-tagger object_template: deploymentconfig.yml.j2 object_objectname: deploymentconfig.yml + when: env == "production" + + - role: openshift/object + object_app: coreos-koji-tagger + object_template: deployment.yml.j2 + object_objectname: deployment.yml + when: env == "staging" ############################################### # actions to delete the project from OpenShift diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/deployment.yml.j2 b/roles/openshift-apps/coreos-koji-tagger/templates/deployment.yml.j2 new file mode 100644 index 0000000000..4002f3de7d --- /dev/null +++ b/roles/openshift-apps/coreos-koji-tagger/templates/deployment.yml.j2 @@ -0,0 +1,64 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: coreos-koji-tagger + name: coreos-koji-tagger + annotations: + image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"coreos-koji-tagger-img:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"coreos-koji-tagger\")].image","paused":false}]' +spec: + replicas: 1 + selector: + matchLabels: + app: coreos-koji-tagger + strategy: + resources: {} + template: + metadata: + labels: + app: coreos-koji-tagger + name: coreos-koji-tagger + spec: + containers: + - env: + - name: COREOS_KOJI_TAGGER_KEYTAB_FILE + value: /etc/coreos-koji-tagger-keytab/koji-keytab +{% if env == "staging" %} + - name: COREOS_KOJI_TAGGER_USE_STG + value: "true" + # Knobs you can change to point to whatever repo you want for testing + # stage code. Feel free to fork/create your own repo to test with and + # replace the values below. The repo must be set up with + # https://apps.fedoraproject.org/github2fedmsg so that it can get + # messages on the message bus when commits are made. + - name: GITHUB_REPO_FULLNAME + value: "coreos/fedora-coreos-config" + - name: GITHUB_REPO_BRANCHES + value: "refs/heads/testing-devel refs/heads/next-devel" +{% endif %} + # sleep infinity is useful for debugging environment issues + # comment out when not debugging + # args: ['infinity'] + # command: ['/usr/bin/sleep'] + volumeMounts: + - name: coreos-koji-tagger-keytab-volume + mountPath: /etc/coreos-koji-tagger-keytab + readOnly: true + - name: coreos-koji-tagger-krb5-conf-volume + mountPath: /etc/krb5.conf + subPath: krb5.conf + readOnly: true + image: "" + imagePullPolicy: IfNotPresent + name: coreos-koji-tagger + resources: {} + volumes: + - name: coreos-koji-tagger-keytab-volume + secret: + secretName: coreos-koji-tagger-keytab + optional: true + - name: coreos-koji-tagger-krb5-conf-volume + configMap: + name: coreos-koji-tagger-krb5-conf + restartPolicy: Always