From nobody Sun Feb 8 12:37:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585649384; cv=none; d=zohomail.com; s=zohoarc; b=WP+0qb6iHIE3gWBUQ0yHlHZiMWn/37zEkBau5fpwHpL/SF5I2dcp8+8qOPr4sirhaJ86KTOx5CTbRCak72XnAVlNZJ/PFlXE2mCtktxqMr2wYGG28vhNgK1vGuuCVLChK60C2wlpvGO74GQDpe+U1Lj5tEyKLgT56dv5SAwL1oY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585649384; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0iE4Tg9lGQlQXdZ8NUybOYSMJibBzOJu6BbDgS7OQs0=; b=MZKMfyYCTt6MayiEtLlvcnkQifwSpRd2g5myygWnVbh8E2I+oMpugnqQLiRPUOUHKWn8htoD7r1PE35z80+vTvZZFEBwG/QM8QThdxXoW/rnufEfMJ+xpF5xMNuFDJaHHFOVc1BI8UgcW60yHDUgyiuw7LQunF4ozB0xYsK2yAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1585649384988607.2672797972212; Tue, 31 Mar 2020 03:09:44 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-147-zq5EwXl2OYOH-C8P0pLXaQ-1; Tue, 31 Mar 2020 06:09:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E1E818A6ECE; Tue, 31 Mar 2020 10:09:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 519D65D9CA; Tue, 31 Mar 2020 10:09:10 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 061EC18089D7; Tue, 31 Mar 2020 10:09:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02VA98hE027151 for ; Tue, 31 Mar 2020 06:09:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 913441001DC2; Tue, 31 Mar 2020 10:09:08 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E2A41001B2D; Tue, 31 Mar 2020 10:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585649383; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0iE4Tg9lGQlQXdZ8NUybOYSMJibBzOJu6BbDgS7OQs0=; b=Iy2/tcEMbeczm6MqDt8b221ypWUorgc3ZGtFgWFWJs1M42r3GDjWmELrM0LVHpLAUN4aDi HPfcWKa3PBLqih492A2NXymQ6OAK9ldnHIR2H2fuYCRwddQuqh4tPX6MvIW2dhw/UPc2+h LszpEAoJev0WD4uGfLkyt2F0g05H2yw= X-MC-Unique: zq5EwXl2OYOH-C8P0pLXaQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [virttools-planet PATCH 3/4] Remove obsolete openshift hosting configuration Date: Tue, 31 Mar 2020 11:08:52 +0100 Message-Id: <20200331100853.359718-4-berrange@redhat.com> In-Reply-To: <20200331100853.359718-1-berrange@redhat.com> References: <20200331100853.359718-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Andrea Bolognani --- openshift/templates/.gitignore | 2 - openshift/templates/update-tls.sh | 16 - openshift/templates/virttools-planet-tls.json | 82 ---- openshift/templates/virttools-planet.json | 425 ------------------ web/httpd-cfg/cors.conf | 3 - 5 files changed, 528 deletions(-) delete mode 100644 openshift/templates/.gitignore delete mode 100755 openshift/templates/update-tls.sh delete mode 100644 openshift/templates/virttools-planet-tls.json delete mode 100644 openshift/templates/virttools-planet.json delete mode 100644 web/httpd-cfg/cors.conf diff --git a/openshift/templates/.gitignore b/openshift/templates/.gitignore deleted file mode 100644 index 199c6e6..0000000 --- a/openshift/templates/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -tls-cert.pem -tls-key.pem diff --git a/openshift/templates/update-tls.sh b/openshift/templates/update= -tls.sh deleted file mode 100755 index 0351959..0000000 --- a/openshift/templates/update-tls.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -function die() { - echo $* - exit 1 -} - -test -f "tls-cert.pem" || die "Missing tls-cert.pem" -test -f "tls-key.pem" || die "Missing tls-key.pem" - -TLS_CERT=3D`cat tls-cert.pem` -TLS_KEY=3D`cat tls-key.pem` - -oc process -f virttools-planet-tls.json | oc delete -f - -oc process -p TLS_CERT=3D"$TLS_CERT" -p TLS_KEY=3D"$TLS_KEY" -f virttools-= planet-tls.json | oc create -f - - diff --git a/openshift/templates/virttools-planet-tls.json b/openshift/temp= lates/virttools-planet-tls.json deleted file mode 100644 index 1f26f2e..0000000 --- a/openshift/templates/virttools-planet-tls.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Template", - "labels": { - "app": "virttools-planet", - "template": "virttools-planet" - }, - "message": "The following service(s) have been created in your project= : ${NAME}.\n", - "metadata": { - "name": "virtttools-planet", - "annotations": { - "openshift.io/display-name": "Virt Tools", - "description": "Static web for planet.virt-tools.org", - "tags": "quickstart,httpd", - "iconClass": "icon-apache", - "openshift.io/long-description": "Template for planet.virttool= s.org static web content", - "openshift.io/provider-display-name": "Libvirt", - "template.openshift.io/bindable": "false" - } - }, - "objects": [ - { - "kind": "Route", - "apiVersion": "v1", - "metadata": { - "name": "planet.virt-tools.org" - }, - "spec": { - "host": "planet.virt-tools.org", - "to": { - "kind": "Service", - "name": "${NAME}" - }, - "tls": { - "termination": "edge", - "insecureEdgeTerminationPolicy": "Redirect", - "key": "${TLS_KEY}", - "certificate": "${TLS_CERT}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "metadata": { - "name": "planet.virttools.org" - }, - "spec": { - "host": "planet.virttools.org", - "to": { - "kind": "Service", - "name": "${NAME}" - }, - "tls": { - "termination": "edge", - "insecureEdgeTerminationPolicy": "Redirect", - "key": "${TLS_KEY}", - "certificate": "${TLS_CERT}" - } - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objec= ts defined in this template.", - "required": true, - "value": "virttools-planet" - }, - { - "name": "TLS_KEY", - "displayName": "TLS key for public routes", - "description": "TLS key for public routes" - }, - { - "name": "TLS_CERT", - "displayName": "TLS cert for public routes", - "description": "TLS cert for public routes" - } - ] -} diff --git a/openshift/templates/virttools-planet.json b/openshift/template= s/virttools-planet.json deleted file mode 100644 index 749f180..0000000 --- a/openshift/templates/virttools-planet.json +++ /dev/null @@ -1,425 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Template", - "labels": { - "app": "virttools-planet", - "template": "virttools-planet" - }, - "message": "The following service(s) have been created in your project= : ${NAME}.\n", - "metadata": { - "name": "virtttools-planet", - "annotations": { - "openshift.io/display-name": "Planet Virt Tools", - "description": "Static web for planet.virt-tools.org", - "tags": "quickstart,httpd", - "iconClass": "icon-apache", - "openshift.io/long-description": "Template for planet.virttool= s.org static web content", - "openshift.io/provider-display-name": "Libvirt", - "template.openshift.io/bindable": "false" - } - }, - "objects": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}", - "annotations": { - "description": "Exposes and load balances the applicat= ion pods" - } - }, - "spec": { - "ports": [ - { - "name": "web", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "name": "${NAME}" - } - } - }, - { - "kind": "PersistentVolumeClaim", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}-web" - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "1Gi" - } - } - } - }, - { - "kind": "PersistentVolumeClaim", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}-cache" - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "1Gi" - } - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}" - }, - "spec": { - "host": "${APPLICATION_DOMAIN}", - "to": { - "kind": "Service", - "name": "${NAME}" - }, - "tls": { - "termination": "edge", - "insecureEdgeTerminationPolicy": "Allow" - } - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}-updater", - "annotations": { - "description": "Keeps track of changes in the applicat= ion image" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}-updater", - "annotations": { - "description": "Defines how to build the application", - "template.alpha.openshift.io/wait-for-ready": "true" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR_UPDATER}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "from": { - "kind": "DockerImage", - "name": "centos/python-27-centos7" - } - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}-updater:latest" - } - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}-web", - "annotations": { - "description": "Keeps track of changes in the applicat= ion image" - } - } - }, - { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}-web", - "annotations": { - "description": "Defines how to build the application", - "template.alpha.openshift.io/wait-for-ready": "true" - } - }, - "spec": { - "source": { - "type": "Git", - "git": { - "uri": "${SOURCE_REPOSITORY_URL}", - "ref": "${SOURCE_REPOSITORY_REF}" - }, - "contextDir": "${CONTEXT_DIR_WEB}" - }, - "strategy": { - "type": "Source", - "sourceStrategy": { - "from": { - "kind": "DockerImage", - "name": "centos/httpd-24-centos7" - } - } - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}-web:latest" - } - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "type": "GitHub", - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - } - }, - { - "type": "Generic", - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - } - } - ] - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "${NAME}", - "annotations": { - "description": "Defines how to deploy the application = server", - "template.alpha.openshift.io/wait-for-ready": "true" - } - }, - "spec": { - "strategy": { - "type": "Recreate" - }, - "triggers": [ - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "virttools-planet-updater" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}-updater:latest" - } - } - }, - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "virttools-planet-web" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}-web:latest" - } - } - }, - { - "type": "ConfigChange" - } - ], - "replicas": 1, - "selector": { - "name": "${NAME}" - }, - "template": { - "metadata": { - "name": "${NAME}", - "labels": { - "name": "${NAME}" - } - }, - "spec": { - "containers": [ - { - "name": "virttools-planet-web", - "image": "docker-registry.default.svc:5000= /libvirt/${NAME}-web:latest", - "ports": [ - { - "containerPort": 8080 - } - ], - "volumeMounts": [ - { - "name": "${NAME}-web", - "mountPath": "/opt/app-root/src" - } - ], - "readinessProbe": { - "timeoutSeconds": 3, - "initialDelaySeconds": 3, - "httpGet": { - "path": "/", - "port": 8080 - } - }, - "livenessProbe": { - "timeoutSeconds": 3, - "initialDelaySeconds": 30, - "httpGet": { - "path": "/", - "port": 8080 - } - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - }, - "env": [ - ] - }, - { - "name": "${NAME}-updater", - "image": "docker-registry.default.svc:5000/libvirt/${NAME}-updater:lat= est", - "volumeMounts": [ - { - "name": "${NAME}-web", - "mountPath": "/opt/app-root/web" - }, - { - "name": "${NAME}-cache", - "mountPath": "/opt/app-root/cache" - } - ] - } - ], - "volumes": [ - { - "name": "${NAME}-web", - "persistentVolumeClaim": { - "claimName": "${NAME}-web" - } - }, - { - "name": "${NAME}-cache", - "persistentVolumeClaim": { - "claimName": "${NAME}-cache" - } - } - ] - } - } - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objec= ts defined in this template.", - "required": true, - "value": "virttools-planet" - }, - { - "name": "NAMESPACE", - "displayName": "Namespace", - "description": "The OpenShift Namespace where the ImageStream = resides.", - "required": true, - "value": "openshift" - }, - { - "name": "MEMORY_LIMIT", - "displayName": "Memory Limit", - "description": "Maximum amount of memory the container can use= .", - "required": true, - "value": "512Mi" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "The URL of the repository with your applicatio= n source code.", - "required": true, - "value": "git://libvirt.org/virttools-planet.git" - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of= your repository if you are not using the default branch." - }, - { - "name": "CONTEXT_DIR_UPDATER", - "displayName": "Context Directory", - "description": "Set this to the relative path to your project = if it is not in the root of your repository.", - "value": "updater" - }, - { - "name": "CONTEXT_DIR_WEB", - "displayName": "Context Directory", - "description": "Set this to the relative path to your project = if it is not in the root of your repository.", - "value": "web" - }, - { - "name": "APPLICATION_DOMAIN", - "displayName": "Application Hostname", - "description": "The exposed hostname that will route to the ht= tpd service, if left blank a value will be defaulted.", - "value": "" - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "GitHub Webhook Secret", - "description": "Github trigger secret. A difficult to guess s= tring encoded as part of the webhook URL. Not encrypted.", - "generate": "expression", - "from": "[a-zA-Z0-9]{40}" - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "A secret string used to configure the Generic = webhook.", - "generate": "expression", - "from": "[a-zA-Z0-9]{40}" - } - ] -} diff --git a/web/httpd-cfg/cors.conf b/web/httpd-cfg/cors.conf deleted file mode 100644 index bbebfdd..0000000 --- a/web/httpd-cfg/cors.conf +++ /dev/null @@ -1,3 +0,0 @@ -Header set Access-Control-Allow-Origin "https://libvirt.org" -Header set Access-Control-Allow-Methods "GET" -Header set Vary "Origin" --=20 2.24.1