From 42bbf4fbe372aace13666dbbe5791230988614ef Mon Sep 17 00:00:00 2001 From: ChenLong Ma Date: Fri, 2 Apr 2021 15:55:16 +0800 Subject: [PATCH] Update version (#391) * update version Signed-off-by: ChenLong Ma * update dockerfile Signed-off-by: ChenLong Ma * fix pulsar config Signed-off-by: ChenLong Ma --- helm-charts/FATE/templates/pulsar.yaml | 12 +++- k8s-deploy/Makefile | 2 +- k8s-deploy/cluster-spark.yaml | 2 +- k8s-deploy/cluster.yaml | 2 +- k8s-deploy/examples/config.sh | 81 ++++++++++++++++++++++++++ k8s-deploy/kubefate.yaml | 2 +- k8s-deploy/pkg/api/version.go | 2 +- 7 files changed, 95 insertions(+), 8 deletions(-) create mode 100644 k8s-deploy/examples/config.sh diff --git a/helm-charts/FATE/templates/pulsar.yaml b/helm-charts/FATE/templates/pulsar.yaml index 8b770a5af..a9724023b 100644 --- a/helm-charts/FATE/templates/pulsar.yaml +++ b/helm-charts/FATE/templates/pulsar.yaml @@ -54,12 +54,18 @@ data: # Configuration Store connection string configurationStoreServers= - brokerServicePort=6650 + {{- if .Values.modules.pulsar.exchange }} brokerServicePortTls=6651 + {{- else }} + brokerServicePort=6650 + {{- end }} # Port to use to server HTTP request - webServicePort=8080 + {{- if .Values.modules.pulsar.exchange }} webServicePortTls=8081 + {{- else }} + webServicePort=8080 + {{- end }} # Hostname or IP address the service binds on, default is 0.0.0.0. bindAddress=0.0.0.0 @@ -957,7 +963,7 @@ spec: spec: containers: - name: pulsar - image: apachepulsar/pulsar:2.7.0 + image: {{ .Values.image.registry }}/pulsar:2.7.0 imagePullPolicy: {{ .Values.image.pullPolicy }} command: - /bin/bash diff --git a/k8s-deploy/Makefile b/k8s-deploy/Makefile index 30c81f50c..6109ed807 100644 --- a/k8s-deploy/Makefile +++ b/k8s-deploy/Makefile @@ -1,5 +1,5 @@ NAME ?= federatedai/kubefate -VERSION ?= v1.4.0 +VERSION ?= v1.4.1 IMG ?= ${NAME}:${VERSION} ifeq (,$(shell go env GOBIN)) diff --git a/k8s-deploy/cluster-spark.yaml b/k8s-deploy/cluster-spark.yaml index bf8531ad8..47a70ee16 100644 --- a/k8s-deploy/cluster-spark.yaml +++ b/k8s-deploy/cluster-spark.yaml @@ -1,7 +1,7 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.5.0 +chartVersion: v1.6.0 partyId: 9999 registry: "" imageTag: "" diff --git a/k8s-deploy/cluster.yaml b/k8s-deploy/cluster.yaml index 54bd6b238..d3b561e8d 100644 --- a/k8s-deploy/cluster.yaml +++ b/k8s-deploy/cluster.yaml @@ -1,7 +1,7 @@ name: fate-9999 namespace: fate-9999 chartName: fate -chartVersion: v1.5.1 +chartVersion: v1.6.0 partyId: 9999 registry: "" imageTag: "" diff --git a/k8s-deploy/examples/config.sh b/k8s-deploy/examples/config.sh new file mode 100644 index 000000000..d5b859cfb --- /dev/null +++ b/k8s-deploy/examples/config.sh @@ -0,0 +1,81 @@ +#!/bin/bash + +source party.config + +echo ${chartVersion} +echo ${imageTAG} +echo ${party_9999_IP} +echo ${party_10000_IP} +echo ${party_exchange_IP} + +# 9999 config +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster-serving.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster-spark.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-9999/cluster-spark-pulsar.yaml + +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster-serving.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster-spark.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-9999/cluster-spark-pulsar.yaml + + +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-9999/cluster.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-9999/cluster-serving.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-9999/cluster-spark.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-9999/cluster-spark-pulsar.yaml + +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-9999/cluster.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-9999/cluster-serving.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-9999/cluster-spark.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-9999/cluster-spark-pulsar.yaml + +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-9999/cluster.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-9999/cluster-serving.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-9999/cluster-spark.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-9999/cluster-spark-pulsar.yaml + +# 10000 config + +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster-serving.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster-spark.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-10000/cluster-spark-pulsar.yaml + +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster-serving.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster-spark.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-10000/cluster-spark-pulsar.yaml + +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-10000/cluster.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-10000/cluster-serving.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-10000/cluster-spark.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-10000/cluster-spark-pulsar.yaml + +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-10000/cluster.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-10000/cluster-serving.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-10000/cluster-spark.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-10000/cluster-spark-pulsar.yaml + +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-10000/cluster.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-10000/cluster-serving.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-10000/cluster-spark.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-10000/cluster-spark-pulsar.yaml + + +# exchange config + +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-exchange/rollsite.yaml +sed -i "s/chartVersion: .*/chartVersion: ${chartVersion}/g" ./party-exchange/trafficServer.yaml + +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-exchange/rollsite.yaml +sed -i "s/imageTag: .*/imageTag: ${imageTAG}/g" ./party-exchange/trafficServer.yaml + +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-exchange/rollsite.yaml +sed -i "s/192.168.9.1/${party_9999_IP}/g" ./party-exchange/trafficServer.yaml + +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-exchange/rollsite.yaml +sed -i "s/192.168.10.1/${party_10000_IP}/g" ./party-exchange/trafficServer.yaml + +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-exchange/rollsite.yaml +sed -i "s/192.168.0.1/${party_exchange_IP}/g" ./party-exchange/trafficServer.yaml diff --git a/k8s-deploy/kubefate.yaml b/k8s-deploy/kubefate.yaml index adc3957b3..83dd5485f 100644 --- a/k8s-deploy/kubefate.yaml +++ b/k8s-deploy/kubefate.yaml @@ -19,7 +19,7 @@ spec: spec: serviceAccountName: kubefate-admin containers: - - image: federatedai/kubefate:v1.4.0 + - image: federatedai/kubefate:v1.4.1 imagePullPolicy: IfNotPresent name: kubefate env: diff --git a/k8s-deploy/pkg/api/version.go b/k8s-deploy/pkg/api/version.go index d99920aab..0f5b5b0b5 100644 --- a/k8s-deploy/pkg/api/version.go +++ b/k8s-deploy/pkg/api/version.go @@ -20,7 +20,7 @@ import ( ) // ServiceVersion code release version -const ServiceVersion = "v1.4.0" +const ServiceVersion = "v1.4.1" // Version API struct type Version struct {