Revert "fedora-image-uploader: Add staging config for container uploads"

This reverts commit 5e0ad1134d (pr #2200).

Unfortunately, using buildah inside an unprivileged OpenShift container
turns out to not be very simple, even though we're not building any
containers, just importing and pushing them.

We can either figure out how to make it work with OpenShift (and while
it is definitely possible, I don't know if folks are okay with the
compromises that might be required) or deploy it in a VM for now.

In the meantime, the staging container is bootlooping so I'd like to
back this configuration out for the sake of my inbox.
This commit is contained in:
Jeremy Cline 2024-09-20 10:01:51 -04:00
parent b7d61b6a77
commit 15dbcbb7ac
No known key found for this signature in database
4 changed files with 0 additions and 50 deletions

View file

@ -103,11 +103,6 @@
template: aws-secrets.yml
objectname: aws-secrets.yml
- role: openshift/object
app: cloud-image-uploader
template: container-secrets.yml
objectname: container-secrets.yml
- role: openshift/start-build
app: cloud-image-uploader
buildname: cloud-image-uploader-build

View file

@ -107,13 +107,6 @@ storage_account_type = "Standard_ZRS"
{% endif %}
{% if env == "staging" %}
[[consumer_config.container.registries]]
url = "oci-registry01.stg.iad2.fedoraproject.org"
credential_prefix = "FEDORA_REGISTRY_"
{% endif %}
[qos]
prefetch_size = 0
prefetch_count = 25

View file

@ -1,18 +0,0 @@
apiVersion: v1
kind: Secret
metadata:
name: "podman-credentials"
labels:
app: "cloud-image-uploader"
stringData:
{% if env == 'staging' %}
fedoraproject_registry_username: "{{candidate_registry_osbs_stg_username}}"
fedoraproject_registry_password: "{{candidate_registry_osbs_stg_password}}"
quay_io_username: ""
quay_io_password: ""
{% else %}
fedoraproject_registry_username: "{{candidate_registry_osbs_prod_username}}"
fedoraproject_registry_password: "{{candidate_registry_osbs_prod_password}}"
quay_io_username: "{{quay_io_username}}"
quay_io_password: "{{quay_io_password}}"
{% endif %}

View file

@ -65,26 +65,6 @@ spec:
secretKeyRef:
name: aws-credentials
key: secret_access_key
- name: FEDORA_REGISTRY_USER
valueFrom:
secretKeyRef:
name: podman-credentials
key: fedoraproject_registry_username
- name: FEDORA_REGISTRY_PASSWORD
valueFrom:
secretKeyRef:
name: podman-credentials
key: fedoraproject_registry_password
- name: QUAY_IO_USER
valueFrom:
secretKeyRef:
name: podman-credentials
key: quay_io_username
- name: QUAY_IO_PASSWORD
valueFrom:
secretKeyRef:
name: podman-credentials
key: quay_io_password
volumeMounts:
- name: config-volume
mountPath: /etc/fedora-messaging