From 349365964feb7328d08f7af336e1693ff0393fe6 Mon Sep 17 00:00:00 2001 From: bczoma Date: Fri, 16 Jul 2021 14:34:07 -0400 Subject: [PATCH 1/4] Assert-master fix for broker 9.10 --- ci/templateInstallBroker | 2 +- templates/eventbroker_ha_template.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/templateInstallBroker b/ci/templateInstallBroker index 225b573..a6cfcab 100644 --- a/ci/templateInstallBroker +++ b/ci/templateInstallBroker @@ -4,7 +4,7 @@ sudo sed -i 's/nameserver.*$/nameserver 1.1.1.1/g' /etc/resolv.conf while ! oc login -u kubeadmin -p `cat /opt/passw` https://api.crc.testing:6443 ; do sleep 1 ; done oc new-project $1 sed -i 's@cpu: "2"@cpu: "1"@g' $2 # reduce CPU requirements for the test deployment -oc process -f $2 DEPLOYMENT_NAME=my-release BROKER_IMAGE_REGISTRY_URL=solace/solace-pubsub-standard BROKER_IMAGE_TAG=latest BROKER_STORAGE_SIZE=10Gi BROKER_ADMIN_PASSWORD=YWRtaW4= | oc create -f - # admin password is admin +oc process -f $2 DEPLOYMENT_NAME=my-release BROKER_IMAGE_REGISTRY_URL=bczoma/solacetest BROKER_IMAGE_TAG=latest BROKER_STORAGE_SIZE=10Gi BROKER_ADMIN_PASSWORD=YWRtaW4= | oc create -f - # admin password is admin while ! oc get pods --show-labels | grep my-release | grep "active=true" ; do sleep 1; done oc get pods --show-labels oc get svc diff --git a/templates/eventbroker_ha_template.yaml b/templates/eventbroker_ha_template.yaml index 0fa1254..64f1fe3 100644 --- a/templates/eventbroker_ha_template.yaml +++ b/templates/eventbroker_ha_template.yaml @@ -222,9 +222,9 @@ objects: # Now can issue {resync_step} command echo "`date` INFO: ${APP}-Initiating ${resync_step}" /mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \ - -q "<${resync_step}>" + -q "<${resync_step}>" /mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \ - -q "<${resync_step}>default" + -q "<${resync_step}>default" # Wait for config-sync results count=0 echo "`date` INFO: ${APP}-Waiting for config-sync connected" From b4d843544be4222d5a578f791c6d0072e4a68fe1 Mon Sep 17 00:00:00 2001 From: bczoma Date: Fri, 16 Jul 2021 15:25:20 -0400 Subject: [PATCH 2/4] Moved backwards compatibility to 9.8 --- templates/eventbroker_ha_template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/eventbroker_ha_template.yaml b/templates/eventbroker_ha_template.yaml index 64f1fe3..3a3399c 100644 --- a/templates/eventbroker_ha_template.yaml +++ b/templates/eventbroker_ha_template.yaml @@ -222,9 +222,9 @@ objects: # Now can issue {resync_step} command echo "`date` INFO: ${APP}-Initiating ${resync_step}" /mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \ - -q "<${resync_step}>" + -q "<${resync_step}>" /mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \ - -q "<${resync_step}>default" + -q "<${resync_step}>default" # Wait for config-sync results count=0 echo "`date` INFO: ${APP}-Waiting for config-sync connected" From 0e576f0984dff80052b2f1aaa3b087c5f70334fb Mon Sep 17 00:00:00 2001 From: bczoma Date: Thu, 22 Jul 2021 11:49:03 -0400 Subject: [PATCH 3/4] Updated recommended broker version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13bb1d0..81faaac 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Solace [PubSub+ Platform](https://solace.com/products/platform/) is a complete e ## Overview -This project is a best practice template intended for development and demo purposes. It has been tested using OpenShift v4.6. The tested and recommended Solace PubSub+ Software Event Broker version is 9.8. +This project is a best practice template intended for development and demo purposes. It has been tested using OpenShift v4.6. The tested and recommended Solace PubSub+ Software Event Broker version is 9.10. This document provides a quick getting started guide to install a Solace PubSub+ Software Event Broker in various configurations onto an OpenShift 4 platform. For OpenShift 3.11, refer to the [archived version of this quick start](https://github.com/SolaceProducts/pubsubplus-openshift-quickstart/tree/v1.1.1). From 590f6012644a795fd8bd5b25f3a39fdfba596b8f Mon Sep 17 00:00:00 2001 From: bczoma Date: Thu, 22 Jul 2021 12:24:54 -0400 Subject: [PATCH 4/4] Reverted from using test broker image --- ci/templateInstallBroker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/templateInstallBroker b/ci/templateInstallBroker index a6cfcab..225b573 100644 --- a/ci/templateInstallBroker +++ b/ci/templateInstallBroker @@ -4,7 +4,7 @@ sudo sed -i 's/nameserver.*$/nameserver 1.1.1.1/g' /etc/resolv.conf while ! oc login -u kubeadmin -p `cat /opt/passw` https://api.crc.testing:6443 ; do sleep 1 ; done oc new-project $1 sed -i 's@cpu: "2"@cpu: "1"@g' $2 # reduce CPU requirements for the test deployment -oc process -f $2 DEPLOYMENT_NAME=my-release BROKER_IMAGE_REGISTRY_URL=bczoma/solacetest BROKER_IMAGE_TAG=latest BROKER_STORAGE_SIZE=10Gi BROKER_ADMIN_PASSWORD=YWRtaW4= | oc create -f - # admin password is admin +oc process -f $2 DEPLOYMENT_NAME=my-release BROKER_IMAGE_REGISTRY_URL=solace/solace-pubsub-standard BROKER_IMAGE_TAG=latest BROKER_STORAGE_SIZE=10Gi BROKER_ADMIN_PASSWORD=YWRtaW4= | oc create -f - # admin password is admin while ! oc get pods --show-labels | grep my-release | grep "active=true" ; do sleep 1; done oc get pods --show-labels oc get svc