From 619b390af324fa242591b04da44989b4c9df0f86 Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Sun, 21 Oct 2018 04:04:07 +0800 Subject: [PATCH] Support for full url (base on aalubin changes) (#941) --- charts/fission-all/templates/deployment.yaml | 22 ++++---- charts/fission-all/values.yaml | 3 ++ charts/fission-core/templates/deployment.yaml | 14 +++--- charts/fission-core/values.yaml | 3 ++ test/build_and_test.sh | 10 ++-- test/test_utils.sh | 50 ++++++++++--------- test/upgrade/fission_upgrade_test.sh | 4 +- 7 files changed, 57 insertions(+), 49 deletions(-) diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml index ce56e765..f00bb0b6 100644 --- a/charts/fission-all/templates/deployment.yaml +++ b/charts/fission-all/templates/deployment.yaml @@ -120,7 +120,7 @@ spec: spec: containers: - name: controller - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--controllerPort", "8888", "--prometheusSvc", "http://{{ .Release.Name }}-prometheus-server.{{ .Release.Namespace }}"] @@ -167,7 +167,7 @@ spec: spec: containers: - name: router - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--routerPort", "8888", "--executorUrl", "http://executor.{{ .Release.Namespace }}"] @@ -242,7 +242,7 @@ spec: spec: containers: - name: executor - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--executorPort", "8888", "--namespace", "{{ .Values.functionNamespace }}", "--fission-namespace", "{{ .Release.Namespace }}"] @@ -299,7 +299,7 @@ spec: spec: containers: - name: buildermgr - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"] @@ -328,7 +328,7 @@ spec: spec: containers: - name: kubewatcher - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--kubewatcher", "--routerUrl", "http://router.{{ .Release.Namespace }}"] @@ -438,7 +438,7 @@ spec: spec: containers: - name: fluentd - image: "{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}" + image: "{{ .Values.repository }}/{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} env: - name: INFLUXDB_ADDRESS @@ -498,7 +498,7 @@ spec: spec: containers: - name: timer - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--timer", "--routerUrl", "http://router.{{ .Release.Namespace }}"] @@ -525,9 +525,9 @@ spec: # spec: # containers: # - name: nginx -# image: {{ .Values.fissionUiImage }} +# image: {{ .Values.repository }}/{{ .Values.fissionUiImage }} # - name: kubectl-proxy -# image: lachlanevenson/k8s-kubectl +# image: {{ .Values.repository }}/lachlanevenson/k8s-kubectl # args: ["proxy", "--port", "8001", "--address", "127.0.0.1"] # serviceAccount: fission-svc @@ -576,7 +576,7 @@ spec: spec: containers: - name: mqtrigger - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"] @@ -667,7 +667,7 @@ spec: spec: containers: - name: storagesvc - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--storageServicePort", "8000", "--filePath", "/fission"] diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index 26669e7f..8241294c 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/values.yaml @@ -9,6 +9,9 @@ serviceType: ClusterIP ## For minikube, set this to NodePort, elsewhere use LoadBalancer or ClusterIP. routerServiceType: LoadBalancer +## Image base repository +repository: index.docker.io + ## Fission image repository image: fission/fission-bundle diff --git a/charts/fission-core/templates/deployment.yaml b/charts/fission-core/templates/deployment.yaml index da8d1c6f..3ffe9777 100644 --- a/charts/fission-core/templates/deployment.yaml +++ b/charts/fission-core/templates/deployment.yaml @@ -120,7 +120,7 @@ spec: spec: containers: - name: controller - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--controllerPort", "8888"] @@ -163,7 +163,7 @@ spec: spec: containers: - name: router - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--routerPort", "8888", "--executorUrl", "http://executor.{{ .Release.Namespace }}"] @@ -229,7 +229,7 @@ spec: spec: containers: - name: executor - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--executorPort", "8888", "--namespace", "{{ .Values.functionNamespace }}", "--fission-namespace", "{{ .Release.Namespace }}"] @@ -279,7 +279,7 @@ spec: spec: containers: - name: buildermgr - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"] @@ -308,7 +308,7 @@ spec: spec: containers: - name: kubewatcher - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--kubewatcher", "--routerUrl", "http://router.{{ .Release.Namespace }}"] @@ -330,7 +330,7 @@ spec: spec: containers: - name: timer - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--timer", "--routerUrl", "http://router.{{ .Release.Namespace }}"] @@ -353,7 +353,7 @@ spec: spec: containers: - name: storagesvc - image: "{{ .Values.image }}:{{ .Values.imageTag }}" + image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--storageServicePort", "8000", "--filePath", "/fission"] diff --git a/charts/fission-core/values.yaml b/charts/fission-core/values.yaml index 5b67c8c5..21618f95 100644 --- a/charts/fission-core/values.yaml +++ b/charts/fission-core/values.yaml @@ -9,6 +9,9 @@ serviceType: ClusterIP ## For minikube, set this to NodePort, elsewhere use LoadBalancer or ClusterIP. routerServiceType: LoadBalancer +## Image base repository +repository: index.docker.io + ## Fission image repository image: fission/fission-bundle diff --git a/test/build_and_test.sh b/test/build_and_test.sh index b0bd4840..75f8bc40 100755 --- a/test/build_and_test.sh +++ b/test/build_and_test.sh @@ -18,9 +18,9 @@ fi source $(dirname $0)/test_utils.sh REPO=gcr.io/fission-ci -IMAGE=$REPO/fission-bundle +IMAGE=fission-bundle +FLUENTD_IMAGE=fluentd FETCHER_IMAGE=$REPO/fetcher -FLUENTD_IMAGE=gcr.io/fission-ci/fluentd BUILDER_IMAGE=$REPO/builder TAG=test PRUNE_INTERVAL=1 # this variable controls the interval to run archivePruner. The unit is in minutes. @@ -30,7 +30,7 @@ PRE_UPGRADE_CHECK_IMAGE=$REPO/pre-upgrade-checks dump_system_info -build_and_push_fission_bundle $IMAGE:$TAG +build_and_push_fission_bundle $REPO/$IMAGE:$TAG build_and_push_pre_upgrade_check_image $PRE_UPGRADE_CHECK_IMAGE:$TAG @@ -46,8 +46,8 @@ build_and_push_env_builder python $REPO/python-env-builder:$TAG $BUILDER_IMAGE:$ build_and_push_env_builder jvm $REPO/jvm-env-builder:$TAG $BUILDER_IMAGE:$TAG build_and_push_env_builder go $REPO/go-env-builder:$TAG $BUILDER_IMAGE:$TAG -build_and_push_fluentd $FLUENTD_IMAGE:$TAG +build_and_push_fluentd $REPO/$FLUENTD_IMAGE:$TAG build_fission_cli -install_and_test $IMAGE $TAG $FETCHER_IMAGE $TAG $FLUENTD_IMAGE $TAG $PRUNE_INTERVAL $ROUTER_SERVICE_TYPE $SERVICE_TYPE $PRE_UPGRADE_CHECK_IMAGE +install_and_test $REPO $IMAGE $TAG $FETCHER_IMAGE $TAG $FLUENTD_IMAGE $TAG $PRUNE_INTERVAL $ROUTER_SERVICE_TYPE $SERVICE_TYPE $PRE_UPGRADE_CHECK_IMAGE diff --git a/test/test_utils.sh b/test/test_utils.sh index 87bca86d..f35e610f 100755 --- a/test/test_utils.sh +++ b/test/test_utils.sh @@ -176,23 +176,24 @@ generate_test_id() { helm_install_fission() { id=$1 - image=$2 - imageTag=$3 - fetcherImage=$4 - fetcherImageTag=$5 - controllerNodeport=$6 - routerNodeport=$7 - fluentdImage=$8 - fluentdImageTag=${9} - pruneInterval="${10}" - routerServiceType=${11} - serviceType=${12} - preUpgradeCheckImage=${13} + repo=$2 + image=$3 + imageTag=$4 + fetcherImage=$5 + fetcherImageTag=$6 + controllerNodeport=$7 + routerNodeport=$8 + fluentdImage=$9 + fluentdImageTag=${10} + pruneInterval="${11}" + routerServiceType=${12} + serviceType=${13} + preUpgradeCheckImage=${14} ns=f-$id fns=f-func-$id - helmVars=image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImage=$fluentdImage,logger.fluentdImageTag=$fluentdImageTag,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType,serviceType=$serviceType,preUpgradeChecksImage=$preUpgradeCheckImage,prometheus.server.persistentVolume.enabled=false,prometheus.alertmanager.enabled=false,prometheus.kubeStateMetrics.enabled=false,prometheus.nodeExporter.enabled=false + helmVars=repository=$repo,image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImage=$fluentdImage,logger.fluentdImageTag=$fluentdImageTag,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType,serviceType=$serviceType,preUpgradeChecksImage=$preUpgradeCheckImage,prometheus.server.persistentVolume.enabled=false,prometheus.alertmanager.enabled=false,prometheus.kubeStateMetrics.enabled=false,prometheus.nodeExporter.enabled=false timeout 30 bash -c "helm_setup" @@ -489,16 +490,17 @@ run_test() { } install_and_test() { - image=$1 - imageTag=$2 - fetcherImage=$3 - fetcherImageTag=$4 - fluentdImage=$5 - fluentdImageTag=$6 - pruneInterval=$7 - routerServiceType=$8 - serviceType=$9 - preUpgradeCheckImage=${10} + repo=$1 + image=$2 + imageTag=$3 + fetcherImage=$4 + fetcherImageTag=$5 + fluentdImage=$6 + fluentdImageTag=$7 + pruneInterval=$8 + routerServiceType=$9 + serviceType=${10} + preUpgradeCheckImage=${11} controllerPort=31234 @@ -508,7 +510,7 @@ install_and_test() { id=$(generate_test_id) trap "helm_uninstall_fission $id" EXIT - helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval $routerServiceType $serviceType $preUpgradeCheckImage + helm_install_fission $id $repo $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval $routerServiceType $serviceType $preUpgradeCheckImage helm status $id | grep STATUS | grep -i deployed if [ $? -ne 0 ]; then describe_all_pods $id diff --git a/test/upgrade/fission_upgrade_test.sh b/test/upgrade/fission_upgrade_test.sh index 5f812aaf..1500c352 100755 --- a/test/upgrade/fission_upgrade_test.sh +++ b/test/upgrade/fission_upgrade_test.sh @@ -73,7 +73,7 @@ upgrade_tests ## Build images for Upgrade REPO=gcr.io/fission-ci -IMAGE=$REPO/fission-bundle +IMAGE=fission-bundle FETCHER_IMAGE=$REPO/fetcher FLUENTD_IMAGE=gcr.io/fission-ci/fluentd BUILDER_IMAGE=$REPO/builder @@ -93,7 +93,7 @@ sudo mv $ROOT/fission/fission /usr/local/bin/ ## Upgrade -helmVars=image=$IMAGE,imageTag=$TAG,fetcherImage=$FETCHER_IMAGE,fetcherImageTag=$TAG,logger.fluentdImage=$FLUENTD_IMAGE,logger.fluentdImageTag=$TAG,functionNamespace=$fns,controllerPort=$controllerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType +helmVars=repository=$repo,image=$IMAGE,imageTag=$TAG,fetcherImage=$FETCHER_IMAGE,fetcherImageTag=$TAG,logger.fluentdImage=$FLUENTD_IMAGE,logger.fluentdImageTag=$TAG,functionNamespace=$fns,controllerPort=$controllerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType echo "Upgrading fission" helm upgrade \