From 04eef11fce24a10d6c1bc8bb67dad58af637234f Mon Sep 17 00:00:00 2001 From: Soam Vasani Date: Fri, 8 Sep 2017 20:32:59 -0700 Subject: [PATCH] Set version to 0.2.1-rc in CLI, API and helm charts --- charts/fission-all/Chart.yaml | 4 +--- charts/fission-all/templates/NOTES.txt | 8 +++----- charts/fission-all/values.yaml | 7 ++----- charts/fission-core/Chart.yaml | 4 +--- charts/fission-core/templates/NOTES.txt | 8 +++----- charts/fission-core/values.yaml | 8 ++++---- controller/api.go | 4 ++-- fission/main.go | 1 + 8 files changed, 17 insertions(+), 27 deletions(-) diff --git a/charts/fission-all/Chart.yaml b/charts/fission-all/Chart.yaml index f5c8fa79..90a6052b 100644 --- a/charts/fission-all/Chart.yaml +++ b/charts/fission-all/Chart.yaml @@ -1,14 +1,12 @@ apiVersion: v1 name: fission-all -version: v0.2.0-20170822 +version: 0.2.1-rc description: Fission is a fast serverless framework for Kubernetes. keywords: - fission - serverless home: http://fission.io/ maintainers: - - name: Sanket Sudake - email: sanketsudake@gmail.com - name: Soam Vasani email: soamvasani@platform9.com - name: Ta Ching Chen diff --git a/charts/fission-all/templates/NOTES.txt b/charts/fission-all/templates/NOTES.txt index 06ac3610..0aa9343c 100644 --- a/charts/fission-all/templates/NOTES.txt +++ b/charts/fission-all/templates/NOTES.txt @@ -1,17 +1,15 @@ 1. Install the client CLI. Mac: - $ curl -Lo fission https://github.com/fission/fission/releases/download/nightly20170705/fission-cli-osx && chmod +x fission && sudo mv fission /usr/local/bin/ + $ curl -Lo fission https://github.com/fission/fission/releases/download/v0.2.1-rc/fission-cli-osx && chmod +x fission && sudo mv fission /usr/local/bin/ Linux: - $ curl -Lo fission https://github.com/fission/fission/releases/download/nightly20170705/fission-cli-linux && chmod +x fission && sudo mv fission /usr/local/bin/ + $ curl -Lo fission https://github.com/fission/fission/releases/download/v0.2.1-rc/fission-cli-linux && chmod +x fission && sudo mv fission /usr/local/bin/ Windows: - For Windows, you can use the linux binary on WSL. Or you can download this windows executable: https://github.com/fission/fission/releases/download/nightly20170705/fission-cli-windows.exe + For Windows, you can use the linux binary on WSL. Or you can download this windows executable: https://github.com/fission/fission/releases/download/v0.2.1-rc/fission-cli-windows.exe 2. Set the FISSION_URL and FISSION_ROUTER environment variables. -FISSION_URL is used by the fission CLI to find the server. -FISSION_URL should be prefixed with a http://. (FISSION_ROUTER is only needed for the examples below to work.) {{- if contains "NodePort" .Values.serviceType }} $ export FISSION_URL=http://$(minikube ip):{{ .Values.controllerPort }} diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index de28e0ae..d5a35b56 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/values.yaml @@ -13,13 +13,13 @@ image: fission/fission-bundle pullPolicy: IfNotPresent ## Fission image version -imageTag: v0.2.0-20170822 +imageTag: v0.2.1-rc ## Fission fetcher repository fetcherImage: fission/fetcher ## Fission fetcher image version -fetcherImageTag: v0.2.0-20170822 +fetcherImageTag: v0.2.1-rc ## Port at which Fission controller service should be exposed controllerPort: 31313 @@ -42,9 +42,6 @@ logger: influxdbAdmin: "admin" fluentdImage: fission/fluentd -## Fission ui config -fissionUiImage: fission/fission-ui:0.1.0 - ## Message queue trigger config ### NATS Streaming nats: diff --git a/charts/fission-core/Chart.yaml b/charts/fission-core/Chart.yaml index 2c06a94d..0654ac76 100644 --- a/charts/fission-core/Chart.yaml +++ b/charts/fission-core/Chart.yaml @@ -1,14 +1,12 @@ apiVersion: v1 name: fission-core -version: v0.2.0-20170822 +version: 0.2.1-rc description: Fission is a fast serverless framework for Kubernetes. keywords: - fission - serverless home: http://fission.io/ maintainers: - - name: Sanket Sudake - email: sanketsudake@gmail.com - name: Soam Vasani email: soamvasani@platform9.com - name: Ta Ching Chen diff --git a/charts/fission-core/templates/NOTES.txt b/charts/fission-core/templates/NOTES.txt index 06ac3610..0aa9343c 100644 --- a/charts/fission-core/templates/NOTES.txt +++ b/charts/fission-core/templates/NOTES.txt @@ -1,17 +1,15 @@ 1. Install the client CLI. Mac: - $ curl -Lo fission https://github.com/fission/fission/releases/download/nightly20170705/fission-cli-osx && chmod +x fission && sudo mv fission /usr/local/bin/ + $ curl -Lo fission https://github.com/fission/fission/releases/download/v0.2.1-rc/fission-cli-osx && chmod +x fission && sudo mv fission /usr/local/bin/ Linux: - $ curl -Lo fission https://github.com/fission/fission/releases/download/nightly20170705/fission-cli-linux && chmod +x fission && sudo mv fission /usr/local/bin/ + $ curl -Lo fission https://github.com/fission/fission/releases/download/v0.2.1-rc/fission-cli-linux && chmod +x fission && sudo mv fission /usr/local/bin/ Windows: - For Windows, you can use the linux binary on WSL. Or you can download this windows executable: https://github.com/fission/fission/releases/download/nightly20170705/fission-cli-windows.exe + For Windows, you can use the linux binary on WSL. Or you can download this windows executable: https://github.com/fission/fission/releases/download/v0.2.1-rc/fission-cli-windows.exe 2. Set the FISSION_URL and FISSION_ROUTER environment variables. -FISSION_URL is used by the fission CLI to find the server. -FISSION_URL should be prefixed with a http://. (FISSION_ROUTER is only needed for the examples below to work.) {{- if contains "NodePort" .Values.serviceType }} $ export FISSION_URL=http://$(minikube ip):{{ .Values.controllerPort }} diff --git a/charts/fission-core/values.yaml b/charts/fission-core/values.yaml index b6306cb6..e5153529 100644 --- a/charts/fission-core/values.yaml +++ b/charts/fission-core/values.yaml @@ -7,19 +7,19 @@ serviceType: LoadBalancer ## Fission image repository -image: minikube/fission-bundle +image: fission/fission-bundle ## Fission image version -imageTag: testing +imageTag: v0.2.1-rc ## Image pull policy pullPolicy: IfNotPresent ## Fission fetcher repository -fetcherImage: minikube/fetcher +fetcherImage: fission/fetcher ## Fission fetcher image version -fetcherImageTag: testing +fetcherImageTag: v0.2.1-rc ## Port at which Fission controller service should be exposed controllerPort: 31313 diff --git a/controller/api.go b/controller/api.go index 1e3a518d..a29755e5 100644 --- a/controller/api.go +++ b/controller/api.go @@ -102,11 +102,11 @@ func (api *API) getLogDBConfig(dbType string) logDBConfig { func (api *API) HomeHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - fmt.Fprintf(w, "{\"message\": \"Fission API\", \"version\": \"0.1.0\"}\n") + fmt.Fprintf(w, "{\"message\": \"Fission API\", \"version\": \"0.2.1-rc\"}\n") } func (api *API) ApiVersionMismatchHandler(w http.ResponseWriter, r *http.Request) { - err := fission.MakeError(fission.ErrorNotFound, "Fission server supports API v2 only - v1 is not supported. Please upgrade your Fission client / CLI") + err := fission.MakeError(fission.ErrorNotFound, "Fission server supports API v2 only -- v1 is not supported. Please upgrade your Fission client/CLI.") api.respondWithError(w, err) } diff --git a/fission/main.go b/fission/main.go index 0f6cd366..5f70671a 100644 --- a/fission/main.go +++ b/fission/main.go @@ -26,6 +26,7 @@ func main() { app := cli.NewApp() app.Name = "fission" app.Usage = "Serverless functions for Kubernetes" + app.Version = "0.2.1-rc" app.Flags = []cli.Flag{ cli.StringFlag{Name: "server", Usage: "Fission server URL", EnvVar: "FISSION_URL"},