From 87f66a8ef6fac93cfbd952a7fe4028ada192ecfd Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Wed, 3 May 2023 13:46:54 +0200 Subject: [PATCH] websites: cleaning getfedora.org deployment files --- playbooks/openshift-apps/websites.yml | 59 +++++-------------- .../websites/templates/build.sh | 10 ---- .../websites/templates/cm-updatepot.yml | 9 --- .../websites/templates/configmap.yml | 11 ---- .../websites/templates/cron-updatepot.yml | 47 --------------- .../websites/templates/cron.yml | 35 ----------- .../websites/templates/gitconfig.yml | 13 ---- .../websites/templates/sshconfig.yml | 15 ----- .../websites/templates/updatepot.sh | 21 ------- 9 files changed, 15 insertions(+), 205 deletions(-) delete mode 100644 roles/openshift-apps/websites/templates/build.sh delete mode 100644 roles/openshift-apps/websites/templates/cm-updatepot.yml delete mode 100644 roles/openshift-apps/websites/templates/configmap.yml delete mode 100644 roles/openshift-apps/websites/templates/cron-updatepot.yml delete mode 100644 roles/openshift-apps/websites/templates/cron.yml delete mode 100644 roles/openshift-apps/websites/templates/gitconfig.yml delete mode 100644 roles/openshift-apps/websites/templates/sshconfig.yml delete mode 100644 roles/openshift-apps/websites/templates/updatepot.sh diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml index 52f1220cf6..165d015522 100644 --- a/playbooks/openshift-apps/websites.yml +++ b/playbooks/openshift-apps/websites.yml @@ -20,55 +20,12 @@ - darknao - kevin + # legacy websites - role: openshift/object app: websites file: pvc.yml objectname: pvc.yml - - role: openshift/imagestream - app: websites - imagename: builder - - - role: openshift/object - app: websites - template: buildconfig.yml - objectname: buildconfig.yml - - - role: openshift/start-build - app: websites - buildname: websites-build - objectname: websites-build - - - role: openshift/object - app: websites - template: configmap.yml - objectname: configmap.yml - - - role: openshift/object - app: websites - template: cm-updatepot.yml - objectname: cm-updatepot.yml - - - role: openshift/object - app: websites - template: gitconfig.yml - objectname: gitconfig.yml - - - role: openshift/object - app: websites - template: sshconfig.yml - objectname: sshconfig.yml - - - role: openshift/object - app: websites - template: cron.yml - objectname: cron.yml - - - role: openshift/object - app: websites - template: cron-updatepot.yml - objectname: cron-updatepot.yml - - role: openshift/imagestream app: websites imagename: fedora-websites @@ -89,6 +46,20 @@ objectname: fedora-websites-cron.yml # New websites 3.0 + - role: openshift/imagestream + app: websites + imagename: builder + + - role: openshift/object + app: websites + template: buildconfig.yml + objectname: buildconfig.yml + + - role: openshift/start-build + app: websites + buildname: websites-build + objectname: websites-build + - role: openshift/object app: websites file: obc.yml diff --git a/roles/openshift-apps/websites/templates/build.sh b/roles/openshift-apps/websites/templates/build.sh deleted file mode 100644 index 4ac2f632fe..0000000000 --- a/roles/openshift-apps/websites/templates/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -xe -cd /tmp -git clone --branch {% if env == "staging" %}staging{% else %}master{% endif %} https://pagure.io/fedora-web/websites.git -cd websites -git rev-parse HEAD -bash ./build-prod.sh /output -curl -O https://codeblock.fedorapeople.org/atomic-htaccess.py -mkdir -p out build -python atomic-htaccess.py -cp -r out/. /output/getfedora.org/ diff --git a/roles/openshift-apps/websites/templates/cm-updatepot.yml b/roles/openshift-apps/websites/templates/cm-updatepot.yml deleted file mode 100644 index ad1abc34a8..0000000000 --- a/roles/openshift-apps/websites/templates/cm-updatepot.yml +++ /dev/null @@ -1,9 +0,0 @@ -{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: updatepot-scripts -data: - updatepot.sh: |- - {{ load_file('updatepot.sh') | indent() }} diff --git a/roles/openshift-apps/websites/templates/configmap.yml b/roles/openshift-apps/websites/templates/configmap.yml deleted file mode 100644 index abd5ee6ecd..0000000000 --- a/roles/openshift-apps/websites/templates/configmap.yml +++ /dev/null @@ -1,11 +0,0 @@ -{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: websites-configmap - labels: - app: websites -data: - build.sh: |- - {{ load_file('build.sh') | indent() }} diff --git a/roles/openshift-apps/websites/templates/cron-updatepot.yml b/roles/openshift-apps/websites/templates/cron-updatepot.yml deleted file mode 100644 index 87e86fbf01..0000000000 --- a/roles/openshift-apps/websites/templates/cron-updatepot.yml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: updatepot -spec: - concurrencyPolicy: Forbid - schedule: "0 20 * * *" - successfulJobsHistoryLimit: 1 - failedJobsHistoryLimit: 1 - activeDeadlineSeconds: 900 - startingDeadlineSeconds: 300 - jobTemplate: - spec: - backoffLimit: 0 - template: - metadata: - labels: - parent: "updatepotcron" - spec: - containers: - - name: pushpot - image: image-registry.openshift-image-registry.svc:5000/websites/builder:latest - command: - - /bin/bash - - /scripts/updatepot.sh - volumeMounts: - - mountPath: /.gitconfig - name: gitconfig - readOnly: true - subPath: .gitconfig - - name: sshconfig - mountPath: /.ssh - readOnly: true - - name: scripts - mountPath: /scripts - restartPolicy: Never - startingDeadlineSeconds: 600 - volumes: - - name: sshconfig - secret: - secretName: sshconfig - - name: gitconfig - configMap: - name: gitconfig - - name: scripts - configMap: - name: updatepot-scripts diff --git a/roles/openshift-apps/websites/templates/cron.yml b/roles/openshift-apps/websites/templates/cron.yml deleted file mode 100644 index 7beba663ca..0000000000 --- a/roles/openshift-apps/websites/templates/cron.yml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: build -spec: - concurrencyPolicy: Forbid - schedule: "0 * * * *" - jobTemplate: - spec: - template: - metadata: - labels: - parent: "cronjobbuild" - spec: - containers: - - name: build - image: image-registry.openshift-image-registry.svc:5000/websites/builder:latest - env: - - name: BUILD_ENV - value: "{{ env_short }}" - volumeMounts: - - name: config - mountPath: /etc/websites - readOnly: true - - name: build-output - mountPath: /output - readOnly: false - restartPolicy: Never - volumes: - - name: config - configMap: - name: websites-configmap - - name: build-output - persistentVolumeClaim: - claimName: websites-storage diff --git a/roles/openshift-apps/websites/templates/gitconfig.yml b/roles/openshift-apps/websites/templates/gitconfig.yml deleted file mode 100644 index a39d6e31d3..0000000000 --- a/roles/openshift-apps/websites/templates/gitconfig.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: gitconfig - labels: - app: websites -data: - .gitconfig: |- - [user] - name = ♪ I'm a bot, bot, bot ♪ - email = _update_web_trans@sundries - diff --git a/roles/openshift-apps/websites/templates/sshconfig.yml b/roles/openshift-apps/websites/templates/sshconfig.yml deleted file mode 100644 index 7930b71dd4..0000000000 --- a/roles/openshift-apps/websites/templates/sshconfig.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: sshconfig - labels: - app: websites -stringData: - id_rsa_web_trans: | - {{ lookup('file', ssh_key_path) | indent(4) }} - config: |- - Host pagure.io - User git - IdentityFile /.ssh/id_rsa_web_trans - StrictHostKeyChecking no diff --git a/roles/openshift-apps/websites/templates/updatepot.sh b/roles/openshift-apps/websites/templates/updatepot.sh deleted file mode 100644 index 7976267ce2..0000000000 --- a/roles/openshift-apps/websites/templates/updatepot.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Add OCP user to passwd -USER_ID=$(id -u) -grep -Ev ":x:${USER_ID}:" /etc/passwd > /tmp/passwd -echo "ocpuser:x:${USER_ID}:0:ocp user:/:/sbin/nologin" >> /tmp/passwd -export LD_PRELOAD=/usr/lib64/libnss_wrapper.so -export NSS_WRAPPER_PASSWD=/tmp/passwd -export NSS_WRAPPER_GROUP=/etc/group - - -cd /tmp -git clone https://pagure.io/fedora-web/websites.git -cd websites - -for i in getfedora.org; do - pushd sites/$i/scripts - ./translations-source.sh - [ -f $i.pot ] && ./push-pot.sh - popd -done