Generate and archive fission cli per OS and platform (#2071 )

* Generate and archive fission cli per OS and platform * Separate tagging from release script
Changes for releasing 1.13 (#2070 )
2021-06-16 13:10:31 +05:30 · 2021-06-15 19:50:23 +05:30 · 2021-06-15 15:03:42 +05:30 · 2021-06-14 18:30:23 +05:30 · 2021-06-14 17:20:44 +05:30 · 2021-06-14 14:48:27 +05:30
646 changed files with 33705 additions and 17366 deletions
@@ -5,6 +5,7 @@ ignore:
  - "examples"
  - "test"
  - "tools"
+  - "pkg/apis/genclient"
 coverage:
  status:
    project:
@@ -0,0 +1,10 @@
+---
+name: Blog
+about: Suggest a blog
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
@@ -0,0 +1,10 @@
+---
+name: Documentation
+about: Suggest changes/addition to documentation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe something that is unclear or not documented and needs a documentation update
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,98 @@
+name: Fission CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  # Job to run change detection
+  integration-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2.3.4
+
+      - name: Checkout sources
+        uses: actions/checkout@v2.3.4
+        with:
+          repository: fission/examples
+          path: examples
+
+      - name: setup go
+        uses: actions/setup-go@v2.1.3
+        with:
+          go-version: "1.15.12"
+
+      - name: Helm installation
+        uses: Azure/setup-helm@v1
+        with:
+          version: v3.3.4
+
+      - name: Kind Clutser
+        uses: engineerd/setup-kind@v0.5.0
+        with:
+          config: kind.yaml
+
+      - name: Configuring and testing the Installation
+        run: |
+          kubectl cluster-info --context kind-kind
+          kind get kubeconfig --internal >$HOME/.kube/config
+          kubectl get nodes
+          sudo apt-get install -y apache2-utils
+
+      - name: Static code analysis
+        run: |
+          ./hack/verify-gofmt.sh
+          ./hack/verify-govet.sh
+          helm lint charts/fission-all/ charts/fission-core/
+
+      - name: Run unit tests
+        run: ./hack/runtests.sh
+
+      - name: Helm update
+        run: helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+
+      - name: Install Skaffold
+        run: |
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64
+          sudo install skaffold /usr/local/bin/
+          skaffold version
+
+      - name: Build and Install Fission
+        run: |
+          kubectl create ns fission
+          kubectl create -k crds/v1
+          skaffold run -p kind-ci
+
+      - name: Build and Install Fission CLI
+        run: |
+          go build -o fission cmd/fission-cli/main.go
+          sudo mv fission /usr/local/bin
+          fission version
+
+      - name: Port-forward fission components
+        run: |
+          kubectl port-forward svc/router 8888:80 -nfission &
+          kubectl port-forward svc/controller 8889:80 -nfission &
+          kubectl port-forward svc/nats-streaming 8890:4222 -nfission &
+
+      - name: Integration tests
+        run: ./test/kind_CI.sh
+
+      - name: Collect Fission Dump
+        if: ${{ failure() }}
+        run: |
+          fission support dump
+
+      - name: Archive fission dump
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: fission-support-dump
+          path: fission-dump/*.zip
+          retention-days: 5
@@ -0,0 +1,53 @@
+name: Upgrade functionality test
+
+on: [workflow_dispatch]
+
+jobs:
+  
+  upgrade-functionality-test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout action sources
+      uses: actions/checkout@v2.3.4
+
+    - name: Setup go
+      uses: actions/setup-go@v2.1.3
+      with:
+        go-version: '1.15.12'
+
+    - name: Setup Helm
+      uses: Azure/setup-helm@v1
+      with:
+        version: v3.3.4
+
+    - name: Setup Kind Clutser
+      uses: engineerd/setup-kind@v0.5.0
+      with:
+        config: kind.yaml
+        
+    - name: Setup kubectl & fetch node information
+      run: |
+        kubectl cluster-info --context kind-kind
+        kind get kubeconfig --internal >$HOME/.kube/config
+        kubectl get nodes
+        
+    - name: Dump system info
+      run: |
+        source ./test/upgrade_test/fission_objects.sh dump_system_info
+
+    - name: Install and configure previous stable fission
+      run: |
+        source ./test/upgrade_test/fission_objects.sh install_stable_release \
+        && create_fission_objects \
+        && test_fission_objects
+
+    - name: Upgrade fission to latest
+      run: |
+        source ./test/upgrade_test/fission_objects.sh build_docker_images \
+        && kind_image_load \
+        && install_current_release \
+        && install_fission_cli
+
+    - name: Test previously created fission objects with new release
+      run: |
+        source ./test/upgrade_test/fission_objects.sh test_fission_objects
@@ -5,6 +5,7 @@ cmd/fission-cli/fission-cli
 cmd/fetcher/fetcher
 cmd/builder/builder
 cmd/preupgradechecks/pre-upgrade-checks
+cmd/reporter/reporter

 # Logs
 test/logs/
@@ -32,3 +33,5 @@ environments/dotnet20/Builder/.vs/
 environments/dotnet20/.vs/
 environments/dotnet20/obj/
 environments/dotnet20/bin/
+
+build/
@@ -1,61 +0,0 @@
-sudo: required
-
-dist: trusty
-
-branches:
-  only:
-    - master
-
-language: go
-
-go:
-  - 1.12.x
-
-env:
-  - KUBECONFIG=${HOME}/.kube/config PATH=$HOME/k8scli:$HOME/tool:$HOME/google-cloud-sdk/bin:${PATH} GO111MODULE=on DOCKER_CACHE_DIR=${HOME}/docker/
-
-cache:
-  directories:
-    - $HOME/google-cloud-sdk/
-    - $HOME/k8scli
-    - $HOME/tool
-    - $HOME/.cache/go-build
-    - $HOME/gopath/pkg/mod
-
-services:
-  - docker
-
-before_install:
-  - sudo apt-get update
-#  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - sudo apt-get -y install apache2-utils parallel realpath
-  - sudo sysctl net.ipv6.conf.all.disable_ipv6=0
-
-install:
-  - hack/travis-kube-setup.sh
-
-before_script:
-  - cd ${TRAVIS_BUILD_DIR}
-  - go mod download
-  - hack/verify-staticcheck.sh
-  - hack/verify-gofmt.sh
-  - hack/verify-govet.sh
-  - helm lint charts/fission-all/ charts/fission-core/
-  - hack/runtests.sh
-  - test/build.sh
-
-script:
-  - cd ${TRAVIS_BUILD_DIR}
-  - test/test.sh
-  - test/upgrade/fission_upgrade_test.sh
-
-after_script:
-  - bash <(curl -s https://codecov.io/bash)
-  - kubectl --namespace default delete configmap -l travisID=${TRAVIS_BUILD_ID} # remove in-test configmap to indicate this CI build finished
-
-notifications:
-  slack:
-    rooms:
-      secure: YZ34vsfw1TtftJypg1MyP4+ihONI4gaxeS3FghBQli6+EezjzcxOXyj5VD+x0ucXfDeTaDrFfmVN0SAGObOoZUE+ea9KAoTo50tRLaD9kwOTACiekZalC4uuBguH0D1/A6vlbU8dchsr9mvIhbisG6mTncdPtqGYYHtyBQme6ngmmHbVAQFZcIBHmNuDb/HWhSr8KMEuyB6+mBXLYELHnXnf26cOhdGNaagqCOJTiemX85RGwIuOPxyBhKDFMLyHohDT7FJMH/qijveE6YgOYTQC5nYc2Np1KvC7hQkIu4nuyczyYlrNQl/TWv+SVI8PjIs0PYuCuD3gUqoVEi8d94HbrOPzFEpbwDS9P4qL39DGmco1Q56Vqxe6sRI0vDWPb5gCP1lSgs3PMECVn7Wor/pTvcL+C+U2jLwWJUl0vbyWCL7ngl/3iTssV7qBpUrI7Oclwp8LrQo9fPj0DL4gE9rNanpEWjQ6yPGaysIL1zLHtRghhm52A22NJGp71jkS2KEpLi6ZWFYjMeuXw5eOQFhqFlzyRJOmLYa3B607TLWuyo2L2CxAfMmq0FGfemvrkLZIWtlQKK4y9ImpsURwaGT2XCtThFtHl77wEss913nC+T2dX3O5Bl0UmxFd5S3mVM109I8c4lDosxnAjRfS9MheFlrG0gjSJSBCw57x7f0=
-    on_success: change
-    on_failure: always
@@ -1,29 +1,240 @@
-# 1.7.0-rc.2
+# 1.12.0
 [Documentation](https://docs.fission.io/)
-## Downloads for 1.7.0-rc.2
+## Downloads for 1.12.0


 filename | sha256 hash
 -------- | -----------
-[fission-all-1.7.0-rc.2-openshift.yaml](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-all-1.7.0-rc.2-openshift.yaml) | `67c0ffcb0e156b87237cd3a712a1435f09365701f4c516d5e9a83cb3f1c73041`
-[fission-core-1.7.0-rc.2.yaml](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-core-1.7.0-rc.2.yaml) | `79e620b73b6a6b9f3f0290aa5b8b6daf7f77e938e34e839fc8b84cee00351b49`
-[fission-core-1.7.0-rc.2-openshift.yaml](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-core-1.7.0-rc.2-openshift.yaml) | `a180331a308500cc6bc936b6c6f262bef69e6d75d5d0a1a54e5912845822ff51`
-[fission-all-1.7.0-rc.2-minikube.yaml](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-all-1.7.0-rc.2-minikube.yaml) | `7c43a8acc3125e4a25444cedda15e045c90d911689cb18042ce7c4a0f7b6cc73`
-[fission-core-1.7.0-rc.2-minikube.yaml](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-core-1.7.0-rc.2-minikube.yaml) | `9c052808104ae833e7d2ed23403f2c84a595f525ef7b9e53dee6b70a810cf032`
-[fission-all-1.7.0-rc.2.yaml](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-all-1.7.0-rc.2.yaml) | `594ebff290c13ad590a0fa44bbbd45a5b5e0ee6fac853d197e7bc756773c5089`
-[fission-core-1.7.0-rc.2.tgz](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-core-1.7.0-rc.2.tgz) | `8ba194e2bf9cf5ea95b851093675268d1bcb713bdf2f9f8ed0fae26fe7731718`
-[fission-all-1.7.0-rc.2.tgz](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-all-1.7.0-rc.2.tgz) | `76359916272b408ee21e18a74e230d5f344bea5d95a050fc931547760a8b52b1`
-[fission-cli-osx](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-cli-osx) | `0b79ba3bd1d74e3fdac12f966753c5268df3f32f7fdab3d11431fdfbd8d3e5d2`
-[fission-cli-windows.exe](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-cli-windows.exe) | `9f94e3ad7248b7f5883e78a8a7c0fb41ec7467680be445582e7e5fb1f6a62a50`
-[fission-cli-linux](https://github.com/fission/fission/releases/download/1.7.0-rc.2/fission-cli-linux) | `0f37a1164df007c540e36dead66226fc9919ad5182aa479baabc46da2e9ee72f`
+[fission-all-1.12.0.tgz](https://github.com/fission/fission/releases/download/1.12.0/fission-all-1.12.0.tgz) | `10dfa6df66cfcc7f4887086357857ff25cb7e7e2f906b9c11e2d70e1a7bc8113`
+[fission-core-1.12.0.tgz](https://github.com/fission/fission/releases/download/1.12.0/fission-core-1.12.0.tgz) | `89d745e2130cf7ff281b35100482d6560a2880f0a4e34ffda6428070eccd1945`
+[fission-cli-linux](https://github.com/fission/fission/releases/download/1.12.0/fission-cli-linux) | `bcb3d84a424af45fb8ba5e846238475e481c01907eb10d38a3a614b288da785c`
+[fission-cli-windows.exe](https://github.com/fission/fission/releases/download/1.12.0/fission-cli-windows.exe) | `005f5404545d49546259ee801b52987cb375816ba1c341f8e8fc6f316b16c0b2`
+[fission-cli-osx](https://github.com/fission/fission/releases/download/1.12.0/fission-cli-osx) | `d6c192b96cca741e264c6bacb900ebe40419c4a68e2cec93a889c5c2874ecd5b`
+[fission-core-1.12.0.yaml](https://github.com/fission/fission/releases/download/1.12.0/fission-core-1.12.0.yaml) | `2908fc54ed514b0c600664c5b7cacc35dd9fdb242269c1be3e589d53fbc4f8e5`
+[fission-all-1.12.0.yaml](https://github.com/fission/fission/releases/download/1.12.0/fission-all-1.12.0.yaml) | `2a95051c91a507944805eed26103d1ccfa1e222951645a314814cac912e41391`
+[fission-all-1.12.0-minikube.yaml](https://github.com/fission/fission/releases/download/1.12.0/fission-all-1.12.0-minikube.yaml) | `91bf41f63ac449861ddf3fc5a0b0ecd061a20f7e17331b8d913f17ac76e65649`
+[fission-core-1.12.0-minikube.yaml](https://github.com/fission/fission/releases/download/1.12.0/fission-core-1.12.0-minikube.yaml) | `b71a5f0314e32d0fe3a98c5cbe22308c265203daeea342855a847c1185ce368a`
+[fission-all-1.12.0-openshift.yaml](https://github.com/fission/fission/releases/download/1.12.0/fission-all-1.12.0-openshift.yaml) | `906fb10ea9d052e455c9f50613ee6b54ab8bd93d7d7350740ceaf8fdf8618ac4`
+[fission-core-1.12.0-openshift.yaml](https://github.com/fission/fission/releases/download/1.12.0/fission-core-1.12.0-openshift.yaml) | `b46908adf6dda8601ac975b6fa0b32e7564b08d54347e106ce04b5e2d01e47b1`

-# Change Log
+# Changelog
+
+## [1.12.0](https://github.com/fission/fission/tree/1.12.0) (2021-02-11)
+
+[Full Changelog](https://github.com/fission/fission/compare/v1.12.0...1.12.0)
+
+**Merged pull requests:**
+
+- Exit with status code 1 on failed package builds [\#1926](https://github.com/fission/fission/pull/1926) ([RealHarshThakur](https://github.com/RealHarshThakur))
+- Fix status code for rate limit [\#1924](https://github.com/fission/fission/pull/1924) ([RealHarshThakur](https://github.com/RealHarshThakur))
+- Fixing issue of pulling docker image twice in CI [\#1903](https://github.com/fission/fission/pull/1903) ([therahulbhati](https://github.com/therahulbhati))
+- Updates required for multi-architecture builds. [\#1891](https://github.com/fission/fission/pull/1891) ([cerebrate](https://github.com/cerebrate))
+- Improved readyPod queue implementation and bugfix [\#1890](https://github.com/fission/fission/pull/1890) ([therahulbhati](https://github.com/therahulbhati))
+- Put message to error topic when exceed max retries in kafka mqt [\#1885](https://github.com/fission/fission/pull/1885) ([chenjr0719](https://github.com/chenjr0719))
+- Migrating to keda2.0 [\#1868](https://github.com/fission/fission/pull/1868) ([RealHarshThakur](https://github.com/RealHarshThakur))
+- Updated role and permission for fission-crd cluster role [\#1867](https://github.com/fission/fission/pull/1867) ([therahulbhati](https://github.com/therahulbhati))
+- Envupdate crossupdate fix [\#1866](https://github.com/fission/fission/pull/1866) ([RealHarshThakur](https://github.com/RealHarshThakur))
+- Spec validation option [\#1865](https://github.com/fission/fission/pull/1865) ([RealHarshThakur](https://github.com/RealHarshThakur))
+- Added concurrency field to schema validation [\#1727](https://github.com/fission/fission/pull/1727) ([therahulbhati](https://github.com/therahulbhati))
+- Updated tags of connector images [\#1934](https://github.com/fission/fission/pull/1934) ([therahulbhati](https://github.com/therahulbhati))
+- Updated go plugin version for Github Action CI/CD [\#1922](https://github.com/fission/fission/pull/1922) ([therahulbhati](https://github.com/therahulbhati))
+- Fixed golangci-lint issues: /fission/pkg [\#1902](https://github.com/fission/fission/pull/1902) ([gauravgahlot](https://github.com/gauravgahlot))
+- Remove unnecessary import package. [\#1897](https://github.com/fission/fission/pull/1897) ([tosone](https://github.com/tosone))
+- Replace build status badge to use GH Actions status [\#1887](https://github.com/fission/fission/pull/1887) ([therahulbhati](https://github.com/therahulbhati))
+- Github Actions Workflows [\#1876](https://github.com/fission/fission/pull/1876) ([therahulbhati](https://github.com/therahulbhati))
+- Readypod optimization in executor [\#1860](https://github.com/fission/fission/pull/1860) ([therahulbhati](https://github.com/therahulbhati))
+- Release 1.11.2 [\#1843](https://github.com/fission/fission/pull/1843) ([therahulbhati](https://github.com/therahulbhati))
+- Fixed golangci-lint issues: /fission/pkg/executor [\#1842](https://github.com/fission/fission/pull/1842) ([gauravgahlot](https://github.com/gauravgahlot))
+-  Update nats streaming image name in values.yaml and deployments yaml  [\#1839](https://github.com/fission/fission/pull/1839) ([girishg4t](https://github.com/girishg4t))
+- Fixed golangci-lint issues: /fission/pkg/router [\#1831](https://github.com/fission/fission/pull/1831) ([gauravgahlot](https://github.com/gauravgahlot))
+- Fix golint warnings for publisher package [\#1822](https://github.com/fission/fission/pull/1822) ([ShajithaMohammed](https://github.com/ShajithaMohammed))
+- in-progress golint warning fixes [\#1799](https://github.com/fission/fission/pull/1799) ([ari-hacks](https://github.com/ari-hacks))
+
+## [v1.11.2](https://github.com/fission/fission/tree/v1.11.2) (2020-10-20)
+
+[Full Changelog](https://github.com/fission/fission/compare/1.11.1...v1.11.2)
+
+**Merged pull requests:**
+
+- Fix env resources getting pruned due to CRD Validation [\#1833](https://github.com/fission/fission/pull/1833) ([therahulbhati](https://github.com/therahulbhati))
+- Fixed typos across fission repo [\#1832](https://github.com/fission/fission/pull/1832) ([gauravgahlot](https://github.com/gauravgahlot))
+- Release 1.11.1 [\#1838](https://github.com/fission/fission/pull/1838) ([vishal-biyani](https://github.com/vishal-biyani))
+
+## [1.11.1](https://github.com/fission/fission/tree/1.11.1) (2020-10-14)
+
+[Full Changelog](https://github.com/fission/fission/compare/v1.11.0...1.11.1)
+
+**Merged pull requests:**
+
+- Added field to preserve fields during CRD validation [\#1818](https://github.com/fission/fission/pull/1818) ([therahulbhati](https://github.com/therahulbhati))
+- fix\(docs\): Update Readme [\#1742](https://github.com/fission/fission/pull/1742) ([iamdarshshah](https://github.com/iamdarshshah))
+- Update README.md - fix typo [\#1737](https://github.com/fission/fission/pull/1737) ([Parikshit-Hooda](https://github.com/Parikshit-Hooda))
+- \[skip ci\] fix contributing.md link on readme [\#1731](https://github.com/fission/fission/pull/1731) ([mrturkmencom](https://github.com/mrturkmencom))
+- Added concurrency field to schema validation [\#1727](https://github.com/fission/fission/pull/1727) ([therahulbhati](https://github.com/therahulbhati))
+- Improving contributing docs [\#1726](https://github.com/fission/fission/pull/1726) ([vishal-biyani](https://github.com/vishal-biyani))
+- Added code to prevent deletion of active fn pod [\#1724](https://github.com/fission/fission/pull/1724) ([therahulbhati](https://github.com/therahulbhati))
+- Release 1.11.0 [\#1716](https://github.com/fission/fission/pull/1716) ([vishal-biyani](https://github.com/vishal-biyani))
+- Added flag for insecureSkipVerfiy [\#1829](https://github.com/fission/fission/pull/1829) ([therahulbhati](https://github.com/therahulbhati))
+- Update aws-kinesis image name in values.yaml [\#1817](https://github.com/fission/fission/pull/1817) ([girishg4t](https://github.com/girishg4t))
+- Improvements from scale testing [\#1812](https://github.com/fission/fission/pull/1812) ([therahulbhati](https://github.com/therahulbhati))
+- Update aws-sqs image name in values.yaml [\#1714](https://github.com/fission/fission/pull/1714) ([therahulbhati](https://github.com/therahulbhati))
+
+## [1.11.0](https://github.com/fission/fission/tree/1.11.0) (2020-09-16)
+
+[Full Changelog](https://github.com/fission/fission/compare/1.10.0...1.11.0)
+
+**Merged pull requests:**
+
+- Bumping up release of Helm for release script [\#1715](https://github.com/fission/fission/pull/1715) ([vishal-biyani](https://github.com/vishal-biyani))
+- Skaffold: Typo in Helm values for Prometheus [\#1709](https://github.com/fission/fission/pull/1709) ([vishal-biyani](https://github.com/vishal-biyani))
+- logs: change timestamp to ISO [\#1708](https://github.com/fission/fission/pull/1708) ([sahil-lakhwani](https://github.com/sahil-lakhwani))
+- Bump jetty-server from 9.0.4.v20130625 to 9.4.17.v20190418 in /environments/jvm-jersey [\#1706](https://github.com/fission/fission/pull/1706) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Addition of openapischemav3 to fission CRDs to support kubectl explain [\#1702](https://github.com/fission/fission/pull/1702) ([ankitjain235](https://github.com/ankitjain235))
+- Skaffold kind [\#1700](https://github.com/fission/fission/pull/1700) ([vishal-biyani](https://github.com/vishal-biyani))
+- Adding Concurrency in Pool Manager [\#1698](https://github.com/fission/fission/pull/1698) ([therahulbhati](https://github.com/therahulbhati))
+- Adding NodeJS version 12 env [\#1683](https://github.com/fission/fission/pull/1683) ([vishal-biyani](https://github.com/vishal-biyani))
+- Removed code related to mqtrigger [\#1680](https://github.com/fission/fission/pull/1680) ([therahulbhati](https://github.com/therahulbhati))
+- jvm-jersey-env [\#1677](https://github.com/fission/fission/pull/1677) ([sahil-lakhwani](https://github.com/sahil-lakhwani))
+- Update values.yaml with mqt keda configuration [\#1670](https://github.com/fission/fission/pull/1670) ([therahulbhati](https://github.com/therahulbhati))
+- Release 1.10.0 [\#1658](https://github.com/fission/fission/pull/1658) ([vishal-biyani](https://github.com/vishal-biyani))
+- \(fix\) Dependencies and steps for building examples/java locally [\#1653](https://github.com/fission/fission/pull/1653) ([rahulchheda](https://github.com/rahulchheda))
+- Allow user to override nats-streaming image [\#1645](https://github.com/fission/fission/pull/1645) ([funkypenguin](https://github.com/funkypenguin))
+- Allow user to define busybox image [\#1643](https://github.com/fission/fission/pull/1643) ([funkypenguin](https://github.com/funkypenguin))
+- Add headers to Kafka MQT error topics [\#1701](https://github.com/fission/fission/pull/1701) ([ankitjain235](https://github.com/ankitjain235))
+- Non-root users access Secrets and ConfigMaps  [\#1697](https://github.com/fission/fission/pull/1697) ([atsai1220](https://github.com/atsai1220))
+- Added prefix tag in fluentbit filter stanza [\#1671](https://github.com/fission/fission/pull/1671) ([therahulbhati](https://github.com/therahulbhati))
+- 1665: Python env sentry integration [\#1669](https://github.com/fission/fission/pull/1669) ([vir-mir](https://github.com/vir-mir))
+- Fission MQT integration with keda [\#1657](https://github.com/fission/fission/pull/1657) ([therahulbhati](https://github.com/therahulbhati))
+- Add serviceaccount for nats-streaming [\#1646](https://github.com/fission/fission/pull/1646) ([funkypenguin](https://github.com/funkypenguin))
+- Allow user to override value of influxdb image [\#1642](https://github.com/fission/fission/pull/1642) ([funkypenguin](https://github.com/funkypenguin))
+
+## [v1.10.0](https://github.com/fission/fission/tree/v1.10.0) (2020-06-29)
+
+[Full Changelog](https://github.com/fission/fission/compare/v1.9.0...v1.10.0)
+
+**Merged pull requests:**
+
+- Make mergePodSpec pick up enableServiceLinks [\#1601](https://github.com/fission/fission/pull/1601) ([darkworon](https://github.com/darkworon))
+- Bump rack from 2.0.8 to 2.1.4 in /environments/ruby [\#1654](https://github.com/fission/fission/pull/1654) ([dependabot[bot]](https://github.com/apps/dependabot))
+- For fixing staticcheck issue [\#1652](https://github.com/fission/fission/pull/1652) ([vishal-biyani](https://github.com/vishal-biyani))
+- Python env changes for pip3 [\#1633](https://github.com/fission/fission/pull/1633) ([agiwalpooja20](https://github.com/agiwalpooja20))
+- S3 backend for storage service [\#1629](https://github.com/fission/fission/pull/1629) ([vishal-biyani](https://github.com/vishal-biyani))
+- Fixing verify-staticcheck.sh [\#1622](https://github.com/fission/fission/pull/1622) ([rajalokan](https://github.com/rajalokan))
+- Added support for setting bodyParser limit param via environment variable [\#1618](https://github.com/fission/fission/pull/1618) ([therahulbhati](https://github.com/therahulbhati))
+- Skaffold registry [\#1617](https://github.com/fission/fission/pull/1617) ([vishal-biyani](https://github.com/vishal-biyani))
+- \[WIP\] \(feat\) Added Exponential BackOff for Retry in builder [\#1614](https://github.com/fission/fission/pull/1614) ([rahulchheda](https://github.com/rahulchheda))
+- Added codecov badge [\#1604](https://github.com/fission/fission/pull/1604) ([vishal-biyani](https://github.com/vishal-biyani))
+- Update issue templates [\#1602](https://github.com/fission/fission/pull/1602) ([vishal-biyani](https://github.com/vishal-biyani))
+- Release 1.9.0 [\#1597](https://github.com/fission/fission/pull/1597) ([vishal-biyani](https://github.com/vishal-biyani))
+- Added support for kube-context flag, to specify kubernetes context [\#1595](https://github.com/fission/fission/pull/1595) ([therahulbhati](https://github.com/therahulbhati))
+
+## [1.9.0](https://github.com/fission/fission/tree/1.9.0) (2020-05-10)
+
+[Full Changelog](https://github.com/fission/fission/compare/1.8.0...1.9.0)
+
+**Merged pull requests:**
+
+- Kind config  [\#1587](https://github.com/fission/fission/pull/1587) ([vishal-biyani](https://github.com/vishal-biyani))
+- Show short flag on CLI usage [\#1580](https://github.com/fission/fission/pull/1580) ([life1347](https://github.com/life1347))
+- External nats streaming [\#1576](https://github.com/fission/fission/pull/1576) ([vishal-biyani](https://github.com/vishal-biyani))
+- Skaffold Default Repo [\#1575](https://github.com/fission/fission/pull/1575) ([vishal-biyani](https://github.com/vishal-biyani))
+- Python Env Build issue due to gevent [\#1572](https://github.com/fission/fission/pull/1572) ([vishal-biyani](https://github.com/vishal-biyani))
+- create fission environment for go version 1.14 [\#1570](https://github.com/fission/fission/pull/1570) ([Jared-Prime](https://github.com/Jared-Prime))
+- \[chart\] Add PSP for logger [\#1568](https://github.com/fission/fission/pull/1568) ([LittleFox94](https://github.com/LittleFox94))
+- \[WIP\] Skaffold Fix  [\#1567](https://github.com/fission/fission/pull/1567) ([vishal-biyani](https://github.com/vishal-biyani))
+- Adding community meeting link and document [\#1563](https://github.com/fission/fission/pull/1563) ([vishal-biyani](https://github.com/vishal-biyani))
+- Return Kubernetes full error message [\#1560](https://github.com/fission/fission/pull/1560) ([life1347](https://github.com/life1347))
+- Use stock InfluxDB image [\#1557](https://github.com/fission/fission/pull/1557) ([life1347](https://github.com/life1347))
+- Bump Python environment to latest Alpine [\#1547](https://github.com/fission/fission/pull/1547) ([delucca](https://github.com/delucca))
+- Bump nokogiri from 1.10.4 to 1.10.8 in /examples/ruby/parse [\#1544](https://github.com/fission/fission/pull/1544) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Avoid exposing sensitive data to client [\#1543](https://github.com/fission/fission/pull/1543) ([life1347](https://github.com/life1347))
+- Retry querying package info when "not found" [\#1540](https://github.com/fission/fission/pull/1540) ([life1347](https://github.com/life1347))
+- Fix function test timeout doesnt works [\#1539](https://github.com/fission/fission/pull/1539) ([life1347](https://github.com/life1347))
+- Support Function-level idle timeout setting [\#1538](https://github.com/fission/fission/pull/1538) ([life1347](https://github.com/life1347))
+- Add message queue service factory [\#1537](https://github.com/fission/fission/pull/1537) ([life1347](https://github.com/life1347))
+- Update NATS-Streaming dependencies version [\#1533](https://github.com/fission/fission/pull/1533) ([life1347](https://github.com/life1347))
+- Fix Git issue on case-insensitive OS [\#1532](https://github.com/fission/fission/pull/1532) ([life1347](https://github.com/life1347))
+- Reorganize message queue trigger directory structure [\#1531](https://github.com/fission/fission/pull/1531) ([life1347](https://github.com/life1347))
+- Append Environment labels to function pod labels [\#1530](https://github.com/fission/fission/pull/1530) ([life1347](https://github.com/life1347))
+- Place package deploy archive to fix path [\#1529](https://github.com/fission/fission/pull/1529) ([life1347](https://github.com/life1347))
+- Fix github\_changelog\_generator error [\#1527](https://github.com/fission/fission/pull/1527) ([life1347](https://github.com/life1347))
+- Release 1.8.0 [\#1526](https://github.com/fission/fission/pull/1526) ([life1347](https://github.com/life1347))
+
+## [v1.8.0](https://github.com/fission/fission/tree/v1.8.0) (2020-02-03)
+
+[Full Changelog](https://github.com/fission/fission/compare/v1.7.1...v1.8.0)
+
+**Merged pull requests:**
+
+- Revert "Temporarily disable building JVM image during CI builds" [\#1525](https://github.com/fission/fission/pull/1525) ([life1347](https://github.com/life1347))
+- Update TerminationGracePeriod usage text [\#1524](https://github.com/fission/fission/pull/1524) ([life1347](https://github.com/life1347))
+- Set initial package status if its empty [\#1522](https://github.com/fission/fission/pull/1522) ([life1347](https://github.com/life1347))
+- Update slack invitation link [\#1521](https://github.com/fission/fission/pull/1521) ([life1347](https://github.com/life1347))
+- Fix Java spec example [\#1519](https://github.com/fission/fission/pull/1519) ([life1347](https://github.com/life1347))
+- Fix executor wrongly deletes rolebindings [\#1517](https://github.com/fission/fission/pull/1517) ([life1347](https://github.com/life1347))
+- Show global options in usage [\#1516](https://github.com/fission/fission/pull/1516) ([life1347](https://github.com/life1347))
+- Add fake client for local command operation [\#1515](https://github.com/fission/fission/pull/1515) ([life1347](https://github.com/life1347))
+- Set prometheus.enabled=false in core chart [\#1513](https://github.com/fission/fission/pull/1513) ([life1347](https://github.com/life1347))
+- Java env: Add XML dependency [\#1512](https://github.com/fission/fission/pull/1512) ([sahil-lakhwani](https://github.com/sahil-lakhwani))
+- Fix poolmanager wrongly delete env pool [\#1511](https://github.com/fission/fission/pull/1511) ([life1347](https://github.com/life1347))
+- Use patch for robust pod metadata update in poolmgr [\#1509](https://github.com/fission/fission/pull/1509) ([life1347](https://github.com/life1347))
+- Optimize CI build steps to reduce waiting time [\#1508](https://github.com/fission/fission/pull/1508) ([life1347](https://github.com/life1347))
+- Add Go 1.13 support and upgrade Go 1.12 version [\#1507](https://github.com/fission/fission/pull/1507) ([life1347](https://github.com/life1347))
+- Add resource exists error on spec validate [\#1506](https://github.com/fission/fission/pull/1506) ([life1347](https://github.com/life1347))
+- Add --dry option to view the generated spec without saving [\#1504](https://github.com/fission/fission/pull/1504) ([life1347](https://github.com/life1347))
+- Let unit tests run in different namespaces to avoid resource conflict [\#1502](https://github.com/fission/fission/pull/1502) ([life1347](https://github.com/life1347))
+- Move to new CI cluster [\#1500](https://github.com/fission/fission/pull/1500) ([life1347](https://github.com/life1347))
+- Add sponsor logos [\#1499](https://github.com/fission/fission/pull/1499) ([life1347](https://github.com/life1347))
+- Follow kubernetes APIs directory structure [\#1497](https://github.com/fission/fission/pull/1497) ([life1347](https://github.com/life1347))
+- Codebase cleanup & optimization [\#1493](https://github.com/fission/fission/pull/1493) ([life1347](https://github.com/life1347))
+- Use code-generator to generate clientset/informer/lister [\#1492](https://github.com/fission/fission/pull/1492) ([life1347](https://github.com/life1347))
+- Update analytics URL [\#1490](https://github.com/fission/fission/pull/1490) ([life1347](https://github.com/life1347))
+- Add config for fetcher resource requests&limits [\#1489](https://github.com/fission/fission/pull/1489) ([life1347](https://github.com/life1347))
+- Push php-builder to dockerhub [\#1477](https://github.com/fission/fission/pull/1477) ([life1347](https://github.com/life1347))
+- Fix terminationGracePeriod is 0 due to wrong flag type [\#1476](https://github.com/fission/fission/pull/1476) ([life1347](https://github.com/life1347))
+- Fix hello-spec-example [\#1474](https://github.com/fission/fission/pull/1474) ([sahil-lakhwani](https://github.com/sahil-lakhwani))
+- Add message queue nats-streaming example [\#1472](https://github.com/fission/fission/pull/1472) ([life1347](https://github.com/life1347))
+- Add failed/success output to spec validate [\#1471](https://github.com/fission/fission/pull/1471) ([anubhav6663](https://github.com/anubhav6663))
+- Bump rack from 2.0.6 to 2.0.8 in /environments/ruby [\#1470](https://github.com/fission/fission/pull/1470) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Fix go-server failed to load plugin [\#1469](https://github.com/fission/fission/pull/1469) ([life1347](https://github.com/life1347))
+- Add spec list feature [\#1468](https://github.com/fission/fission/pull/1468) ([anubhav6663](https://github.com/anubhav6663))
+- Add controller API client interface [\#1467](https://github.com/fission/fission/pull/1467) ([life1347](https://github.com/life1347))
+- Remove FISSION\_ROUTER for fn test [\#1465](https://github.com/fission/fission/pull/1465) ([sahil-lakhwani](https://github.com/sahil-lakhwani))
+- Add the not present cmname while fn create in err message \[CLI-UX\] [\#1462](https://github.com/fission/fission/pull/1462) ([viveksinghggits](https://github.com/viveksinghggits))
+- Fission 1.7.1 [\#1461](https://github.com/fission/fission/pull/1461) ([life1347](https://github.com/life1347))
+
+## [1.7.1](https://github.com/fission/fission/tree/1.7.1) (2019-12-09)
+
+[Full Changelog](https://github.com/fission/fission/compare/1.7.0...1.7.1)
+
+**Merged pull requests:**
+
+- Fix name conflict when buildermanager merges podspec [\#1460](https://github.com/fission/fission/pull/1460) ([life1347](https://github.com/life1347))
+- Not to exclude hidden file when creating archive [\#1458](https://github.com/fission/fission/pull/1458) ([life1347](https://github.com/life1347))
+- Fission 1.7.0 [\#1457](https://github.com/fission/fission/pull/1457) ([life1347](https://github.com/life1347))
+
+## [v1.7.0](https://github.com/fission/fission/tree/v1.7.0) (2019-12-02)
+
+[Full Changelog](https://github.com/fission/fission/compare/v1.7.0-rc.2...v1.7.0)
+
+**Merged pull requests:**
+
+- Fix release script not uploads OpenShift deploy YAML file [\#1456](https://github.com/fission/fission/pull/1456) ([life1347](https://github.com/life1347))
+- Let executor type manages how to do cleanup for old kubeobjects [\#1455](https://github.com/fission/fission/pull/1455) ([life1347](https://github.com/life1347))
+- Prevent deployment from rolling update due to different instance-id [\#1454](https://github.com/fission/fission/pull/1454) ([life1347](https://github.com/life1347))
+- Make AdoptExistingResources optional [\#1453](https://github.com/fission/fission/pull/1453) ([life1347](https://github.com/life1347))
+- Prevent newdeploy updates deployment if no resources changed [\#1452](https://github.com/fission/fission/pull/1452) ([life1347](https://github.com/life1347))
+- Fix CLI unable to get pod logs from controller [\#1451](https://github.com/fission/fission/pull/1451) ([life1347](https://github.com/life1347))
+- Ignore hidden file when creating archive file [\#1450](https://github.com/fission/fission/pull/1450) ([life1347](https://github.com/life1347))
+- Fix spec init overrides existing deploymentconfig [\#1449](https://github.com/fission/fission/pull/1449) ([life1347](https://github.com/life1347))
+- Fix spec shows source archive is not used [\#1448](https://github.com/fission/fission/pull/1448) ([life1347](https://github.com/life1347))
+- Fix adopted deployment uses old fetcher image [\#1447](https://github.com/fission/fission/pull/1447) ([life1347](https://github.com/life1347))
+- Improve executor bootstrap speed [\#1446](https://github.com/fission/fission/pull/1446) ([life1347](https://github.com/life1347))
+- Fission 1.7.0-rc.2 [\#1445](https://github.com/fission/fission/pull/1445) ([life1347](https://github.com/life1347))

 ## [1.7.0-rc.2](https://github.com/fission/fission/tree/1.7.0-rc.2) (2019-11-27)
-[Full Changelog](https://github.com/fission/fission/compare/v1.7.0-rc.2...1.7.0-rc.2)

-## [v1.7.0-rc.2](https://github.com/fission/fission/tree/v1.7.0-rc.2) (2019-11-27)
-[Full Changelog](https://github.com/fission/fission/compare/1.7.0-rc.1...v1.7.0-rc.2)
+[Full Changelog](https://github.com/fission/fission/compare/1.7.0-rc.1...1.7.0-rc.2)

 **Merged pull requests:**

@@ -35,7 +246,7 @@ filename | sha256 hash
 - Fix poolmanager sets 0 timeout for function specialization [\#1439](https://github.com/fission/fission/pull/1439) ([life1347](https://github.com/life1347))
 - Add huge response body test [\#1437](https://github.com/fission/fission/pull/1437) ([life1347](https://github.com/life1347))
 - Return error when specialization failed [\#1436](https://github.com/fission/fission/pull/1436) ([life1347](https://github.com/life1347))
- Fix poolmanager terminates running function pod periodically [\#1435](https://github.com/fission/fission/pull/1435) ([life1347](https://github.com/life1347))
+-  Fix poolmanager terminates running function pod periodically [\#1435](https://github.com/fission/fission/pull/1435) ([life1347](https://github.com/life1347))
 - Allow to tap multiple function services at one time [\#1434](https://github.com/fission/fission/pull/1434) ([life1347](https://github.com/life1347))
 - Collect function metrics after finishing request [\#1433](https://github.com/fission/fission/pull/1433) ([life1347](https://github.com/life1347))
 - Fix poolmanager crashes when failed to list environment [\#1432](https://github.com/fission/fission/pull/1432) ([life1347](https://github.com/life1347))
@@ -48,11 +259,9 @@ filename | sha256 hash
 - Fix truncated body returned from router [\#1420](https://github.com/fission/fission/pull/1420) ([life1347](https://github.com/life1347))
 - Fission 1.7.0-rc.1 [\#1419](https://github.com/fission/fission/pull/1419) ([life1347](https://github.com/life1347))

-## [1.7.0-rc.1](https://github.com/fission/fission/tree/1.7.0-rc.1) (2019-11-18)
-[Full Changelog](https://github.com/fission/fission/compare/v1.7.0-rc.1...1.7.0-rc.1)
-
 ## [v1.7.0-rc.1](https://github.com/fission/fission/tree/v1.7.0-rc.1) (2019-11-18)
-[Full Changelog](https://github.com/fission/fission/compare/1.6.0...v1.7.0-rc.1)
+
+[Full Changelog](https://github.com/fission/fission/compare/v1.6.0...v1.7.0-rc.1)

 **Merged pull requests:**

@@ -113,10 +322,8 @@ filename | sha256 hash
 - Refactor package CLI command [\#1345](https://github.com/fission/fission/pull/1345) ([life1347](https://github.com/life1347))

 ## [1.6.0](https://github.com/fission/fission/tree/1.6.0) (2019-10-10)
-[Full Changelog](https://github.com/fission/fission/compare/v1.6.0...1.6.0)

-## [v1.6.0](https://github.com/fission/fission/tree/v1.6.0) (2019-10-10)
-[Full Changelog](https://github.com/fission/fission/compare/1.5.0...v1.6.0)
+[Full Changelog](https://github.com/fission/fission/compare/1.5.0...1.6.0)

 **Merged pull requests:**

@@ -159,6 +366,7 @@ filename | sha256 hash
 - Fix kafka producer and consumer logs show empty objects [\#1281](https://github.com/fission/fission/pull/1281) ([vadasambar](https://github.com/vadasambar))

 ## [1.5.0](https://github.com/fission/fission/tree/1.5.0) (2019-09-09)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.4.1...1.5.0)

 **Merged pull requests:**
@@ -194,6 +402,7 @@ filename | sha256 hash
 - Update go dependencies [\#1240](https://github.com/fission/fission/pull/1240) ([life1347](https://github.com/life1347))

 ## [1.4.1](https://github.com/fission/fission/tree/1.4.1) (2019-07-29)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.4.0...1.4.1)

 **Merged pull requests:**
@@ -205,6 +414,7 @@ filename | sha256 hash
 - V1.4.0 [\#1244](https://github.com/fission/fission/pull/1244) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [1.4.0](https://github.com/fission/fission/tree/1.4.0) (2019-07-24)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.3.0...1.4.0)

 **Merged pull requests:**
@@ -237,6 +447,7 @@ filename | sha256 hash
 - Enable go module support for go environment [\#1152](https://github.com/fission/fission/pull/1152) ([life1347](https://github.com/life1347))

 ## [1.3.0](https://github.com/fission/fission/tree/1.3.0) (2019-06-03)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.2.1...1.3.0)

 **Merged pull requests:**
@@ -254,13 +465,14 @@ filename | sha256 hash
 - V1.2.1 [\#1178](https://github.com/fission/fission/pull/1178) ([vishal-biyani](https://github.com/vishal-biyani))
 - Skaffold for Fission [\#1172](https://github.com/fission/fission/pull/1172) ([vishal-biyani](https://github.com/vishal-biyani))
 - Add affinity support [\#1170](https://github.com/fission/fission/pull/1170) ([laurence-hudson-mindfoundry](https://github.com/laurence-hudson-mindfoundry))
- Using templated imagePullPolicy for containers in deployment.yaml [\#1137](https://github.com/fission/fission/pull/1137) ([msshroff](https://github.com/msshroff))
 - Refactor test framework [\#1128](https://github.com/fission/fission/pull/1128) ([darkgerm](https://github.com/darkgerm))
 - Pod specs [\#1106](https://github.com/fission/fission/pull/1106) ([vishal-biyani](https://github.com/vishal-biyani))
+- Include All Currently Supported Trigger Types [\#1043](https://github.com/fission/fission/pull/1043) ([gravypod](https://github.com/gravypod))
 - Allow non-toplevel modules in python environment [\#1042](https://github.com/fission/fission/pull/1042) ([soamvasani](https://github.com/soamvasani))
 - Created dotnet2.0 Builder Image and Added /v2/specialized Endpoint to dotnet2.0 Envrionment  [\#1001](https://github.com/fission/fission/pull/1001) ([paraspatidar](https://github.com/paraspatidar))

 ## [1.2.1](https://github.com/fission/fission/tree/1.2.1) (2019-05-09)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.2.0...1.2.1)

 **Merged pull requests:**
@@ -270,6 +482,7 @@ filename | sha256 hash
 - Fixes broken config path for functions [\#1177](https://github.com/fission/fission/pull/1177) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [1.2.0](https://github.com/fission/fission/tree/1.2.0) (2019-05-03)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.1.0...1.2.0)

 **Merged pull requests:**
@@ -281,6 +494,7 @@ filename | sha256 hash
 - Fix TravisCI go environment version to avoid go bugs [\#1154](https://github.com/fission/fission/pull/1154) ([life1347](https://github.com/life1347))
 - \#1132 nodejs environment, increase body size [\#1149](https://github.com/fission/fission/pull/1149) ([JannikZed](https://github.com/JannikZed))
 - Added php builder to release script fixes \#1140 [\#1145](https://github.com/fission/fission/pull/1145) ([vishal-biyani](https://github.com/vishal-biyani))
+- Using templated imagePullPolicy for containers in deployment.yaml [\#1137](https://github.com/fission/fission/pull/1137) ([msshroff](https://github.com/msshroff))
 - Migrate from glide to official dependencies management tool: Go Module [\#1136](https://github.com/fission/fission/pull/1136) ([life1347](https://github.com/life1347))
 - Fix misleading log when setup portforward [\#1134](https://github.com/fission/fission/pull/1134) ([life1347](https://github.com/life1347))
 - V1.1.0 [\#1129](https://github.com/fission/fission/pull/1129) ([vishal-biyani](https://github.com/vishal-biyani))
@@ -290,6 +504,7 @@ filename | sha256 hash
 - Add links to examples for each Fission environment [\#1090](https://github.com/fission/fission/pull/1090) ([erwinvaneyk](https://github.com/erwinvaneyk))

 ## [1.1.0](https://github.com/fission/fission/tree/1.1.0) (2019-03-25)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.0.0...1.1.0)

 **Merged pull requests:**
@@ -311,6 +526,7 @@ filename | sha256 hash
 - Bump base image version of Go environment to 1.11.4 [\#1026](https://github.com/fission/fission/pull/1026) ([life1347](https://github.com/life1347))

 ## [1.0.0](https://github.com/fission/fission/tree/1.0.0) (2019-02-13)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.0...1.0.0)

 **Merged pull requests:**
@@ -318,6 +534,7 @@ filename | sha256 hash
 - V1.0 [\#1094](https://github.com/fission/fission/pull/1094) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [1.0](https://github.com/fission/fission/tree/1.0) (2019-02-08)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.0-rc2...1.0)

 **Merged pull requests:**
@@ -341,12 +558,12 @@ filename | sha256 hash
 - Replace router svcAddrUpdateLocks with new throttler package for code readability&reusability [\#1047](https://github.com/fission/fission/pull/1047) ([life1347](https://github.com/life1347))

 ## [1.0-rc2](https://github.com/fission/fission/tree/1.0-rc2) (2019-01-14)
+
 [Full Changelog](https://github.com/fission/fission/compare/1.0-rc1...1.0-rc2)

 **Merged pull requests:**

 - solve kubernetes/client-go nested vendor [\#1048](https://github.com/fission/fission/pull/1048) ([yesqiao](https://github.com/yesqiao))
- Include All Currently Supported Trigger Types [\#1043](https://github.com/fission/fission/pull/1043) ([gravypod](https://github.com/gravypod))
 - Update dotnet and perl environment docs for rebuilding env images [\#1035](https://github.com/fission/fission/pull/1035) ([life1347](https://github.com/life1347))
 - \[python-env\] PEP8 Fixes for server.py [\#1034](https://github.com/fission/fission/pull/1034) ([bhavin192](https://github.com/bhavin192))
 - Fix builder not using latest image during CI build [\#1033](https://github.com/fission/fission/pull/1033) ([life1347](https://github.com/life1347))
@@ -367,6 +584,7 @@ filename | sha256 hash
 - Add fluentd.conf as a configmap [\#792](https://github.com/fission/fission/pull/792) ([erwinvaneyk](https://github.com/erwinvaneyk))

 ## [1.0-rc1](https://github.com/fission/fission/tree/1.0-rc1) (2018-12-11)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.12.0...1.0-rc1)

 **Merged pull requests:**
@@ -374,6 +592,7 @@ filename | sha256 hash
 - Use executor type as a delimiter to prevent deploy name conflict [\#1009](https://github.com/fission/fission/pull/1009) ([life1347](https://github.com/life1347))
 - Upgrade environment dependencies for security alert [\#1006](https://github.com/fission/fission/pull/1006) ([life1347](https://github.com/life1347))
 - Rename canary flag name from funcN/funcN-1 to newfunc/oldfunc [\#1003](https://github.com/fission/fission/pull/1003) ([life1347](https://github.com/life1347))
+- Update formatting directive logic to unbreak tests [\#999](https://github.com/fission/fission/pull/999) ([life1347](https://github.com/life1347))
 - Alpine OpenJDK not available anymore [\#985](https://github.com/fission/fission/pull/985) ([vishal-biyani](https://github.com/vishal-biyani))
 - Show builder image when list all envs [\#971](https://github.com/fission/fission/pull/971) ([life1347](https://github.com/life1347))
 - V0.12.0 [\#967](https://github.com/fission/fission/pull/967) ([smruthi2187](https://github.com/smruthi2187))
@@ -396,11 +615,11 @@ filename | sha256 hash
 - Archive package user experience [\#927](https://github.com/fission/fission/pull/927) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [0.12.0](https://github.com/fission/fission/tree/0.12.0) (2018-11-01)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.11.0...0.12.0)

 **Merged pull requests:**

- Update formatting directive logic to unbreak tests [\#999](https://github.com/fission/fission/pull/999) ([life1347](https://github.com/life1347))
 - Keep prometheus and canary deploy set to false in fission-core [\#964](https://github.com/fission/fission/pull/964) ([smruthi2187](https://github.com/smruthi2187))
 - Update readme to include JVM [\#953](https://github.com/fission/fission/pull/953) ([david-mcgillicuddy-ovo](https://github.com/david-mcgillicuddy-ovo))
 - Bump flask version  [\#942](https://github.com/fission/fission/pull/942) ([life1347](https://github.com/life1347))
@@ -420,6 +639,7 @@ filename | sha256 hash
 - Optimize function latency when cache expired/invalid under high concurrency [\#856](https://github.com/fission/fission/pull/856) ([life1347](https://github.com/life1347))

 ## [0.11.0](https://github.com/fission/fission/tree/0.11.0) (2018-10-01)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.10.0...0.11.0)

 **Merged pull requests:**
@@ -442,6 +662,7 @@ filename | sha256 hash
 - Fission supportability: Add dump command to dump information for debugging [\#754](https://github.com/fission/fission/pull/754) ([life1347](https://github.com/life1347))

 ## [0.10.0](https://github.com/fission/fission/tree/0.10.0) (2018-08-17)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.9.2...0.10.0)

 **Merged pull requests:**
@@ -477,6 +698,7 @@ filename | sha256 hash
 - Fix CLI failed to set up port-forwarding when multiple controller pods exist in the same namespace [\#712](https://github.com/fission/fission/pull/712) ([life1347](https://github.com/life1347))

 ## [0.9.2](https://github.com/fission/fission/tree/0.9.2) (2018-07-25)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.9.1...0.9.2)

 **Merged pull requests:**
@@ -491,6 +713,7 @@ filename | sha256 hash
 - Working version of Java builder with Maven [\#783](https://github.com/fission/fission/pull/783) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [0.9.1](https://github.com/fission/fission/tree/0.9.1) (2018-07-07)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.9.0...0.9.1)

 **Merged pull requests:**
@@ -502,6 +725,7 @@ filename | sha256 hash
 - Fix “rm: missing operand” in release script [\#779](https://github.com/fission/fission/pull/779) ([life1347](https://github.com/life1347))

 ## [0.9.0](https://github.com/fission/fission/tree/0.9.0) (2018-07-04)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.8.0...0.9.0)

 **Merged pull requests:**
@@ -531,6 +755,7 @@ filename | sha256 hash
 - Java env alpha [\#656](https://github.com/fission/fission/pull/656) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [0.8.0](https://github.com/fission/fission/tree/0.8.0) (2018-06-05)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.7.2...0.8.0)

 **Merged pull requests:**
@@ -551,6 +776,7 @@ filename | sha256 hash
 - Enabling multi-tenancy for fission objects. [\#655](https://github.com/fission/fission/pull/655) ([smruthi2187](https://github.com/smruthi2187))

 ## [0.7.2](https://github.com/fission/fission/tree/0.7.2) (2018-05-05)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.7.1...0.7.2)

 **Merged pull requests:**
@@ -577,6 +803,7 @@ filename | sha256 hash
 - Testing proposal: Requirements and frameworks exploration [\#581](https://github.com/fission/fission/pull/581) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [0.7.1](https://github.com/fission/fission/tree/0.7.1) (2018-04-10)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.7.0...0.7.1)

 **Merged pull requests:**
@@ -594,6 +821,7 @@ filename | sha256 hash
 - E2E test for NATS-streaming trigger [\#338](https://github.com/fission/fission/pull/338) ([soamvasani](https://github.com/soamvasani))

 ## [0.7.0](https://github.com/fission/fission/tree/0.7.0) (2018-04-02)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.6.1...0.7.0)

 **Merged pull requests:**
@@ -613,7 +841,8 @@ filename | sha256 hash
 - Show fission deployment version with cli [\#538](https://github.com/fission/fission/pull/538) ([life1347](https://github.com/life1347))

 ## [0.6.1](https://github.com/fission/fission/tree/0.6.1) (2018-03-22)
-[Full Changelog](https://github.com/fission/fission/compare/0.6.0...0.6.1)
+
+[Full Changelog](https://github.com/fission/fission/compare/latest...0.6.1)

 **Merged pull requests:**

@@ -629,27 +858,13 @@ filename | sha256 hash
 - Fix executor tries to create a new deployment when a function is updated [\#524](https://github.com/fission/fission/pull/524) ([life1347](https://github.com/life1347))
 - Add container spec config options  to \(build\) environments [\#413](https://github.com/fission/fission/pull/413) ([erwinvaneyk](https://github.com/erwinvaneyk))

-## [0.6.0](https://github.com/fission/fission/tree/0.6.0) (2018-03-01)
-[Full Changelog](https://github.com/fission/fission/compare/latest...0.6.0)
-
-**Merged pull requests:**
-
- Detect fission namespace in cli [\#519](https://github.com/fission/fission/pull/519) ([soamvasani](https://github.com/soamvasani))
- Default values for FISSION\_\* env vars [\#518](https://github.com/fission/fission/pull/518) ([soamvasani](https://github.com/soamvasani))
- Add chart version to job name [\#516](https://github.com/fission/fission/pull/516) ([soamvasani](https://github.com/soamvasani))
- Fix CLI not update function's secret/configmap correctly [\#512](https://github.com/fission/fission/pull/512) ([life1347](https://github.com/life1347))
- Adds latest tags and pushes to dockerhub for fetcher and fission-bundle [\#509](https://github.com/fission/fission/pull/509) ([vishal-biyani](https://github.com/vishal-biyani))
- Fixes the backward compatibility with older environment versions [\#508](https://github.com/fission/fission/pull/508) ([vishal-biyani](https://github.com/vishal-biyani))
- Update Fn: Executor New Deployment [\#504](https://github.com/fission/fission/pull/504) ([vishal-biyani](https://github.com/vishal-biyani))
- Adds default resources for fetcher pod [\#500](https://github.com/fission/fission/pull/500) ([vishal-biyani](https://github.com/vishal-biyani))
- Documentation Revamp [\#496](https://github.com/fission/fission/pull/496) ([vishal-biyani](https://github.com/vishal-biyani))
- Delete and list orphan pkgs [\#468](https://github.com/fission/fission/pull/468) ([smruthi2187](https://github.com/smruthi2187))
- Service type ClusterIP - Controller port forward through CLI [\#431](https://github.com/fission/fission/pull/431) ([prithviramesh](https://github.com/prithviramesh))
- Istio integration [\#421](https://github.com/fission/fission/pull/421) ([life1347](https://github.com/life1347))
- Implement support for Azure storage message queue triggers [\#371](https://github.com/fission/fission/pull/371) ([peterhuene](https://github.com/peterhuene))
-
 ## [latest](https://github.com/fission/fission/tree/latest) (2018-03-01)
-[Full Changelog](https://github.com/fission/fission/compare/0.5.0...latest)
+
+[Full Changelog](https://github.com/fission/fission/compare/0.6.0...latest)
+
+## [0.6.0](https://github.com/fission/fission/tree/0.6.0) (2018-03-01)
+
+[Full Changelog](https://github.com/fission/fission/compare/0.5.0...0.6.0)

 **Merged pull requests:**

@@ -664,8 +879,22 @@ filename | sha256 hash
 - CI modifications [\#491](https://github.com/fission/fission/pull/491) ([smruthi2187](https://github.com/smruthi2187))
 - Add upgrade guide from 0.4.x to 0.5.0 [\#490](https://github.com/fission/fission/pull/490) ([life1347](https://github.com/life1347))
 - Version -\> 0.5.0 [\#489](https://github.com/fission/fission/pull/489) ([life1347](https://github.com/life1347))
+- Detect fission namespace in cli [\#519](https://github.com/fission/fission/pull/519) ([soamvasani](https://github.com/soamvasani))
+- Default values for FISSION\_\* env vars [\#518](https://github.com/fission/fission/pull/518) ([soamvasani](https://github.com/soamvasani))
+- Add chart version to job name [\#516](https://github.com/fission/fission/pull/516) ([soamvasani](https://github.com/soamvasani))
+- Fix CLI not update function's secret/configmap correctly [\#512](https://github.com/fission/fission/pull/512) ([life1347](https://github.com/life1347))
+- Adds latest tags and pushes to dockerhub for fetcher and fission-bundle [\#509](https://github.com/fission/fission/pull/509) ([vishal-biyani](https://github.com/vishal-biyani))
+- Fixes the backward compatibility with older environment versions [\#508](https://github.com/fission/fission/pull/508) ([vishal-biyani](https://github.com/vishal-biyani))
+- Update Fn: Executor New Deployment [\#504](https://github.com/fission/fission/pull/504) ([vishal-biyani](https://github.com/vishal-biyani))
+- Adds default resources for fetcher pod [\#500](https://github.com/fission/fission/pull/500) ([vishal-biyani](https://github.com/vishal-biyani))
+- Documentation Revamp [\#496](https://github.com/fission/fission/pull/496) ([vishal-biyani](https://github.com/vishal-biyani))
+- Delete and list orphan pkgs [\#468](https://github.com/fission/fission/pull/468) ([smruthi2187](https://github.com/smruthi2187))
+- Service type ClusterIP - Controller port forward through CLI [\#431](https://github.com/fission/fission/pull/431) ([prithviramesh](https://github.com/prithviramesh))
+- Istio integration [\#421](https://github.com/fission/fission/pull/421) ([life1347](https://github.com/life1347))
+- Implement support for Azure storage message queue triggers [\#371](https://github.com/fission/fission/pull/371) ([peterhuene](https://github.com/peterhuene))

 ## [0.5.0](https://github.com/fission/fission/tree/0.5.0) (2018-02-07)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.4.1...0.5.0)

 **Merged pull requests:**
@@ -681,6 +910,7 @@ filename | sha256 hash
 - Add readiness probe to go env [\#461](https://github.com/fission/fission/pull/461) ([life1347](https://github.com/life1347))
 - Fix fission bundle build failure [\#456](https://github.com/fission/fission/pull/456) ([life1347](https://github.com/life1347))
 - Convert build.sh to a multi-stage Dockerfile. [\#452](https://github.com/fission/fission/pull/452) ([justinbarrick](https://github.com/justinbarrick))
+- use time.Since instead of time.Now\(\).Sub [\#449](https://github.com/fission/fission/pull/449) ([wgliang](https://github.com/wgliang))
 - NewDeploy Doc [\#432](https://github.com/fission/fission/pull/432) ([vishal-biyani](https://github.com/vishal-biyani))
 - Add go vet check [\#430](https://github.com/fission/fission/pull/430) ([life1347](https://github.com/life1347))
 - Fix potential nil pointer problem [\#485](https://github.com/fission/fission/pull/485) ([life1347](https://github.com/life1347))
@@ -696,12 +926,12 @@ filename | sha256 hash
 - Newdeploy backend [\#387](https://github.com/fission/fission/pull/387) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [0.4.1](https://github.com/fission/fission/tree/0.4.1) (2018-01-20)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.4.0...0.4.1)

 **Merged pull requests:**

 - Fix python environment failed to launch [\#451](https://github.com/fission/fission/pull/451) ([life1347](https://github.com/life1347))
- use time.Since instead of time.Now\(\).Sub [\#449](https://github.com/fission/fission/pull/449) ([wgliang](https://github.com/wgliang))
 - Fix fission function logs [\#448](https://github.com/fission/fission/pull/448) ([prithviramesh](https://github.com/prithviramesh))
 - Integration test improvements [\#447](https://github.com/fission/fission/pull/447) ([soamvasani](https://github.com/soamvasani))
 - Use storageClassName in Helm Charts \(\#444\) [\#445](https://github.com/fission/fission/pull/445) ([agrahamlincoln](https://github.com/agrahamlincoln))
@@ -725,6 +955,7 @@ filename | sha256 hash
 - Executor abstraction [\#384](https://github.com/fission/fission/pull/384) ([vishal-biyani](https://github.com/vishal-biyani))

 ## [0.4.0](https://github.com/fission/fission/tree/0.4.0) (2017-11-15)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.4.0rc...0.4.0)

 **Merged pull requests:**
@@ -737,6 +968,7 @@ filename | sha256 hash
 - changes made to FluentD configuration to circumvent Logger daemonset [\#380](https://github.com/fission/fission/pull/380) ([prithviramesh](https://github.com/prithviramesh))

 ## [0.4.0rc](https://github.com/fission/fission/tree/0.4.0rc) (2017-11-08)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.3.0...0.4.0rc)

 **Merged pull requests:**
@@ -751,6 +983,7 @@ filename | sha256 hash
 - Update k8s client version to 4.0.0 [\#351](https://github.com/fission/fission/pull/351) ([life1347](https://github.com/life1347))

 ## [0.3.0](https://github.com/fission/fission/tree/0.3.0) (2017-09-29)
+
 [Full Changelog](https://github.com/fission/fission/compare/0.3.0-rc...0.3.0)

 **Merged pull requests:**
@@ -761,6 +994,7 @@ filename | sha256 hash
 - Differentiate by environment in fscache eviction [\#361](https://github.com/fission/fission/pull/361) ([soamvasani](https://github.com/soamvasani))

 ## [0.3.0-rc](https://github.com/fission/fission/tree/0.3.0-rc) (2017-09-27)
+
 [Full Changelog](https://github.com/fission/fission/compare/buildmgr-preview-20170922...0.3.0-rc)

 **Merged pull requests:**
@@ -770,17 +1004,16 @@ filename | sha256 hash
 - Fix storage service failed to start after restarting it [\#352](https://github.com/fission/fission/pull/352) ([life1347](https://github.com/life1347))
 - Add bodyparser for text/plain to node-env [\#349](https://github.com/fission/fission/pull/349) ([erwinvaneyk](https://github.com/erwinvaneyk))
 - Fix unsupported checksum type \(issue 342\) [\#343](https://github.com/fission/fission/pull/343) ([life1347](https://github.com/life1347))
+- Multiple Trigger Definitions Fix [\#341](https://github.com/fission/fission/pull/341) ([jsturtevant](https://github.com/jsturtevant))
 - Fission workflow env integration [\#336](https://github.com/fission/fission/pull/336) ([erwinvaneyk](https://github.com/erwinvaneyk))
 - Add builder manager support [\#308](https://github.com/fission/fission/pull/308) ([life1347](https://github.com/life1347))

 ## [buildmgr-preview-20170922](https://github.com/fission/fission/tree/buildmgr-preview-20170922) (2017-09-22)
+
 [Full Changelog](https://github.com/fission/fission/compare/buildmgr-preview-20170921...buildmgr-preview-20170922)

-**Merged pull requests:**
-
- Multiple Trigger Definitions Fix [\#341](https://github.com/fission/fission/pull/341) ([jsturtevant](https://github.com/jsturtevant))
-
 ## [buildmgr-preview-20170921](https://github.com/fission/fission/tree/buildmgr-preview-20170921) (2017-09-21)
+
 [Full Changelog](https://github.com/fission/fission/compare/v0.2.1...buildmgr-preview-20170921)

 **Merged pull requests:**
@@ -796,6 +1029,7 @@ filename | sha256 hash
 - update readme with latest install instructions [\#324](https://github.com/fission/fission/pull/324) ([soamvasani](https://github.com/soamvasani))

 ## [v0.2.1](https://github.com/fission/fission/tree/v0.2.1) (2017-09-12)
+
 [Full Changelog](https://github.com/fission/fission/compare/v0.2.1-rc2...v0.2.1)

 **Merged pull requests:**
@@ -804,9 +1038,11 @@ filename | sha256 hash
 - Release automation script -- attach helm charts, tag env images [\#318](https://github.com/fission/fission/pull/318) ([soamvasani](https://github.com/soamvasani))

 ## [v0.2.1-rc2](https://github.com/fission/fission/tree/v0.2.1-rc2) (2017-09-10)
+
 [Full Changelog](https://github.com/fission/fission/compare/v0.2.1-rc...v0.2.1-rc2)

 ## [v0.2.1-rc](https://github.com/fission/fission/tree/v0.2.1-rc) (2017-09-09)
+
 [Full Changelog](https://github.com/fission/fission/compare/v0.2.0-20170901...v0.2.1-rc)

 **Merged pull requests:**
@@ -818,6 +1054,7 @@ filename | sha256 hash
 - Move builds to package level [\#297](https://github.com/fission/fission/pull/297) ([soamvasani](https://github.com/soamvasani))

 ## [v0.2.0-20170901](https://github.com/fission/fission/tree/v0.2.0-20170901) (2017-09-01)
+
 [Full Changelog](https://github.com/fission/fission/compare/nightly20170705...v0.2.0-20170901)

 **Merged pull requests:**
@@ -852,6 +1089,7 @@ filename | sha256 hash
 - Fix unstoppable kubewatcher [\#208](https://github.com/fission/fission/pull/208) ([life1347](https://github.com/life1347))

 ## [nightly20170705](https://github.com/fission/fission/tree/nightly20170705) (2017-07-06)
+
 [Full Changelog](https://github.com/fission/fission/compare/nightly20170621...nightly20170705)

 **Merged pull requests:**
@@ -861,6 +1099,7 @@ filename | sha256 hash
 - Add message queue trigger support [\#218](https://github.com/fission/fission/pull/218) ([life1347](https://github.com/life1347))

 ## [nightly20170621](https://github.com/fission/fission/tree/nightly20170621) (2017-06-21)
+
 [Full Changelog](https://github.com/fission/fission/compare/alpha20170124...nightly20170621)

 **Merged pull requests:**
@@ -925,6 +1164,7 @@ filename | sha256 hash
 - Added support for running C\# code in a dotnet core environment [\#84](https://github.com/fission/fission/pull/84) ([ktrance](https://github.com/ktrance))

 ## [alpha20170124](https://github.com/fission/fission/tree/alpha20170124) (2017-01-24)
+
 [Full Changelog](https://github.com/fission/fission/compare/kubecon...alpha20170124)

 **Merged pull requests:**
@@ -965,6 +1205,9 @@ filename | sha256 hash
 - Move client-go dependency to 1.5 [\#27](https://github.com/fission/fission/pull/27) ([soamvasani](https://github.com/soamvasani))

 ## [kubecon](https://github.com/fission/fission/tree/kubecon) (2016-11-11)
+
+[Full Changelog](https://github.com/fission/fission/compare/90c14cfa0808aa1d63ea55ad87bee0f651f45091...kubecon)
+
 **Merged pull requests:**

 - Reap idle pods [\#20](https://github.com/fission/fission/pull/20) ([soamvasani](https://github.com/soamvasani))
@@ -1,45 +1,239 @@
-# Contributing to Fission

-### Thank you!
+Thanks for helping make Fission better😍!

-Thank you for taking the time and effort to contribute to Fission!
+There are many areas we can use contributions - ranging from code, documentation, feature proposals, issue triage, samples, and content creation. 

-First, please read the [code of conduct](CODE_OF_CONDUCT.md).  By
-participating, you're expected to uphold this code.
+First, please read the [code of conduct](CODE_OF_CONDUCT.md). By participating, you're expected to uphold this code.

-### Choose something to work on
+Table of Contents
+=================

-The easiest way to start is to look at existing
-[issues](https://github.com/fission/fission/issues) and see if there's
-something there that you'd like to work on.
+   * [Choose something to work on](#choose-something-to-work-on)
+      * [Get Help.](#get-help)
+   * [Contributing - building &amp; deploying](#contributing---building--deploying)
+      * [Prerequisite](#prerequisite)
+      * [Getting Started](#getting-started)
+         * [Use Skaffold with Kind/K8S Cluster to build and deploy](#use-skaffold-with-kindk8s-cluster-to-build-and-deploy)
+      * [Validating Installation](#validating-installation)
+      * [Understanding code structure](#understanding-code-structure)
+         * [cmd](#cmd)
+         * [pkg](#pkg)
+         * [Charts](#charts)
+         * [Environments](#environments)

-Also, if you're familiar with a language that we don't support today,
-adding an environment for a new language is a good task to take on.
-Take a look at the Python environment as an example.
+# Choose something to work on

-If you're interested in working on something that doesn't have an
-existing issue, feel free to file a new one.
+* The easiest way to start is to look at existing [issues](https://github.com/fission/fission/issues) and see if there's something there that you'd like to work on. You can filter issues with label "[Good first issue](https://github.com/fission/fission/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)" which are relatively self sufficient issues and great for first time contributors.
+    - If you are going to pick up an issue, it would be good to add a comment stating the intention.
+    - If the contribution is a big change/new feature, please raise an issue and discuss the needs, design in the issue in detail.

-There's plenty of stuff to do.  If you need help choosing something to
-work on, we'll be happy to suggest something depending on your
-interests.
+* For contributing a new Fission environment, please check the [environments repo](https://github.com/fission/environments)

-### Talk to people
+* For contributing a new Keda Connector, please check the [Keda Connectors repo](https://github.com/fission/keda-connectors)

-At any point, from thinking about contributing to merging your
-changes, please feel free to reach out to us!  We're more than happy
-to talk.

-If you choose a big chunk of work that involves design changes to
-Fission, please talk to us while planning the change; that way we can
-all be on the same page before you invest too much work into it.
+### Get Help.
+
+Do reach out on Slack or Twitter and we are happy to help.

 * Drop by the [slack channel](http://slack.fission.io).
 * Say hi on [twitter](https://twitter.com/fissionio).

-### Contribution Howto

- * Fork this github repo
- * Make a branch in your fork
- * Commit your changes to that branch
- * Create a pull request
+# Contributing - building & deploying
+
+## Prerequisite
+
+- You'll need the `go` compiler and tools installed. Currently version 1.12.x of Go is needed.
+
+- You'll also need [docker](https://docs.docker.com/install) for building images locally.
+
+- You will need a Kubernetes cluster and you can use one of options from below.
+	- [Minikube](https://github.com/kubernetes/minikube)
+	- [Kind](https://kind.sigs.k8s.io/)
+	- Cluster in cloud such as GKE (Google Kubernetes Engine cluster)/ EKS (Elastic Kubernetes Service)/ AKS (Azure Kubernetes Service)
+
+- Kubectl and Helm installed.
+
+- [Skaffold](https://skaffold.dev/docs/install/) for local development workflow to make it easier to build and deploy Fission.
+
+- And of course some basic concepts of Fission such as environment, function are good to be aware of!
+
+## Getting Started
+
+Get the code locally and after you have made changes - you can verify formatting and other basic checks.
+
+```sh
+# Clone the repo
+$ git clone https://github.com/fission/fission.git $GOPATH/src/github.com/fission/fission
+$ cd $GOPATH/src/github.com/fission/fission
+
+$ go mod vendor
+
+# Run checks on your changes
+$ ./hack/verify-gofmt.sh
+$ ./hack/verify-govet.sh
+```
+
+### Use Skaffold with Kind/K8S Cluster to build and deploy
+
+You should bring up Kind/Minikube cluster or if using a cloud provider cluster then Kubecontext should be pointing to appropriate cluster.
+
+* For building & deploying to Cloud Provider K8S cluster such as GKE/EKS/AKS:
+
+```
+$ skaffold config set default-repo vishalbiyani  // (vishalbiyani - should be your registry/Docker Hub handle)
+$ skaffold run
+```
+
+*  For building & deploying to Kind cluster use Kind profile
+```
+$ kind create cluster
+$ kubectl create ns fission
+$ skaffold run -p kind
+```
+
+## Validating Installation
+
+If you are using Helm, you should see release installed:
+
+```
+helm list
+NAME   	NAMESPACE	REVISION	UPDATED                             	STATUS	CHART            	APP VERSION
+fission	fission  	1       	2020-05-19 16:31:46.947562 +0530 IST	success	fission-all-1.11.0	1.11.0
+```
+
+Also you should see the Fission services deployed and running:
+
+```
+$ kubectl get pods -n fission
+NAME                                                    READY   STATUS             RESTARTS   AGE
+buildermgr-6f778d4ff9-dqnq5                             1/1     Running            0          6h9m
+controller-d44bd4f4d-5q4z5                              1/1     Running            0          6h9m
+executor-557c68c6fd-dg8ld                               1/1     Running            0          6h9m
+influxdb-845548c959-2954p                               1/1     Running            0          6h9m
+kubewatcher-5784c454b8-5mqsk                            1/1     Running            0          6h9m
+logger-bncqn                                            2/2     Running            0          6h9m
+mqtrigger-kafka-765b674ff-jk5x9                         1/1     Running            0          6h9m
+mqtrigger-nats-streaming-797498966c-xgxmk               1/1     Running            3          6h9m
+nats-streaming-6bf48bccb6-fmmr9                         1/1     Running            0          6h9m
+router-db76576bd-xxh7r                                  1/1     Running            0          6h9m
+storagesvc-799dcb5bdf-f69k9                             1/1     Running            0          6h9m
+timer-7d85d9c9fb-knctw                                  1/1     Running            0          6h9m
+```
+
+
+## Understanding code structure
+
+### cmd
+
+`cmd` package is entry point for all runtime components and also has Dockerfile for each component. The actual logic here will be pretty light and most of logic of each component is in `pkg` (Discussed later)
+
+| Component         	   | Runtime Component      |Used in|
+| :-------------    	   |:-------------          |:-|
+| fetcher         		   | Docker Image           |Environments|
+| fission-bundle           | Docker Image           |Binary for all components|
+| fission-cli              | CLI Binary             |CLI by user|
+| preupgradechecks         | Docker Image           |Pre-install upgrade|
+
+```
+.
+cmd
+├── fetcher
+│   ├── Dockerfile.fission-fetcher
+│   ├── app
+│   └── main.go
+├── fission-bundle
+│   ├── Dockerfile.fission-bundle
+│   ├── main.go
+│   └── mqtrigger
+├── fission-cli
+│   ├── app
+│   ├── fission-cli
+│   └── main.go
+└── preupgradechecks
+    ├── Dockerfile.fission-preupgradechecks
+    ├── main.go
+    └── preupgradechecks.go
+```
+
+**fetcher** : is a very lightweight component and all of related logic is in fetcher package itself. Fetcher helps in fetching and uploading code and in specializing environments.
+
+**fission-bundle** : is a component which is a single binary for all components. Based on arguments you pass to fission-bundle - it becomes that component. For ex. 
+
+```
+/fission-bundle --controllerPort "8888"							             # Runs Controller
+
+/fission-bundle --kubewatcher --routerUrl http://router.fission  # Runs Kubewatcher
+```
+
+So most server side components running on server side are fission-bundle binary wrapped in container and used with different arguments. Various arguments and environment variables are passed from manifests/helm chart
+
+**fission-cli** : is the cli used by end user to interact Fission
+
+**preupgradechecks** : is again a small independent component to do pre-install upgrade tasks.
+
+
+### pkg
+
+Pkg is where most of core components and logic reside. The structure is fairly self-explanatory for example all of executor related functionality will be in executor package and so on.
+
+```
+.
+├── pkg
+│   ├── apis
+│   ├── builder
+│   ├── buildermgr
+│   ├── cache
+│   ├── canaryconfigmgr
+│   ├── controller
+│   ├── crd
+│   ├── error
+│   ├── executor
+│   ├── fetcher
+│   ├── fission-cli
+│   ├── generator
+│   ├── info
+│   ├── kubewatcher
+│   ├── logger
+│   ├── mqtrigger
+│   ├── plugin
+│   ├── publisher
+│   ├── router
+│   ├── storagesvc
+│   ├── throttler
+│   ├── timer
+│   └── utils
+```
+
+### Charts
+
+Fission currently has two charts - and we recommend using fission-all for development.
+
+```
+.
+├── charts
+│   ├── README.md
+│   ├── fission-all
+│   └── fission-core
+```
+
+### Environments
+
+Each of runtime environments is in fission/environments repo and fairly independent. If you are enhancing or creating a new environment - most likely you will end up making changes in that repo.
+
+```
+.
+├── environments
+│   ├── binary
+│   ├── dotnet
+│   ├── dotnet20
+│   ├── go
+│   ├── jvm
+│   ├── nodejs
+│   ├── perl
+│   ├── php7
+│   ├── python
+│   ├── ruby
+│   └── tensorflow-serving
+```
@@ -0,0 +1,55 @@
+# BUILDING MULTI-ARCHITECTURE IMAGES
+
+While the Docker images for Fission can be built by running:
+
+```
+make image
+```
+
+the stable images are build for multiple architectures (and automatically pushed to the repository) by
+
+```
+make images-multiarch
+```
+
+However, there are several options and requirements for building these images, which are explained here.
+
+## BUILDERS
+
+We use `docker buildx` to build images for multiple architectures. At the moment, this is considered an
+experimental feature by Docker, and as such it requires access to experimental features to be enabled
+in the daemon.json file.
+
+By default, this will use BuildKit and QEMU emulation support to build the image for each architecture
+locally. However, for faster building, it is possible to use native nodes to build each architecture,
+either simple remote Docker instances or a Kubernetes cluster. For information on how to set this up,
+please see the blog article here:
+
+<https://www.docker.com/blog/multi-arch-images/>
+
+And/or the command reference here:
+
+<https://docs.docker.com/engine/reference/commandline/buildx_create/>
+
+## BUILD OPTIONS
+
+### PLATFORMS
+
+The PLATFORMS variable can be set to a comma-separated list of platforms for which images should be
+built when running the multi-arch build. If unset, it defaults to _linux/amd64,linux/arm64,linux/arm_.
+
+### REPOSITORY SELECTION
+
+By default, the multi-arch build will automatically try to push the resulting images to the fission/*
+repositories, under the dev tag; i.e. fission/fission-bundle:dev, fission/fetcher:dev, and
+fission/builder:dev. However, for convenient, this can be customized by setting the REPO and TAG
+environment variables to set a different repository prefix and tag for the images.
+
+For example:
+
+```
+REPO=randomdev TAG=test make images-multiarch
+```
+
+would build and push the images randomdev/fission-bundle:test, randomdev/fetcher:test, and
+randomdev/builder:test . Private Docker repositories can be used in the same manner.
@@ -1,7 +1,7 @@
 # Multi-tenancy in Fission

 Multi-tenancy in Fission allows users to create Fission objects, i.e functions, packages, environments and triggers in different namespaces.
-It mandates that a function reference secrets, configmaps and its package (if explicity referenced during function creation/updation) to be present in the same namespace as the function.
+It mandates that a function reference secrets, configmaps and its package (if explicitly referenced during function create/update operation) to be present in the same namespace as the function.
 This allows user separation and prevents in-advertent access to sensitive data of other users sharing the same cluster.
 However, users are allowed and encouraged to share environments to ensure optimal utilization of cluster resources. To achieve this, users can create all the necessary environments in a ns, say ns1 and then go on to create functions in different namespaces and refer to env in ns1.
 Users that prefer complete isolation can create their env, functions in the same ns.  
@@ -27,20 +27,20 @@ This SA is created in every namespace that a user creates builder environments i

 1. Package-getter-binding

-Every time a user creates a package explicity in a namespace, this rolebinding is created in package's namespace (which is also function's namespace). This grants package-getter role to fission-fetcher SA present in the referenced environment's namespace.
-If the package is a source package, then, fission-builder SA present in the environment namespace is also added to this rolebinding.
+Every time a user creates a package explicitly in a namespace, this role binding is created in package's namespace (which is also function's namespace). This grants package-getter role to fission-fetcher SA present in the referenced environment's namespace.
+If the package is a source package, then, fission-builder SA present in the environment namespace is also added to this role binding.

-Next when the user creates a function in the same namespace, if the function's executor type is newdeploy, then, the fission-fetcher SA present in function namespace is also added to the same rolebinding.
+Next when the user creates a function in the same namespace, if the function's executor type is newdeploy, then, the fission-fetcher SA present in function namespace is also added to the same role binding.

 Note : For functions that have executor type poolmgr, the env pods are created in the namespace that env object is created. Whereas, for those functions that have executor type New deploy mgr, the function pods are created in the namespace that function object is created in.

 This is because, poolmgr allows env sharing and optimal resource utilization. so generic env pools are created in a different namespace and all functions that prefer sharing this env pool can reference these pools.
-If users require strict isolation, they can either create functions with new deploy backend, or, create env's in different namespaces and not share them across functions.
+If users require strict isolation, they can either create functions with new deploy backend, or, create envs in different namespaces and not share them across functions.

 2. Secret-Configmap-getter-binding

 Every time a user creates a function in a namespace, Secret-Configmap-getter-binding is created in the same namespace, granting secret-configmap-getter role to fission-fetcher SA present in the referenced environment's namespace in case the executor type is poolmgr.
-If the executor type is newdeploymgr, then the same rolebinding is created in the same namespace as the function, granting the same secret-configmap-getter role to fission-fetcher SA present in the function namespace.
+If the executor type is newdeploymgr, then the same role binding is created in the same namespace as the function, granting the same secret-configmap-getter role to fission-fetcher SA present in the function namespace.

 ## Examples

@@ -51,7 +51,7 @@ $ fission env create --name python --image fission/python-env --envns ns1
 $ fission function create --name func1 --env python --code hello.py --fns ns2
 ```

-2. create a builder and runtime environment in ns3, a source pkg in ns3 and a function referring to this src pkg also in ns3. (for complete isolation, all objs are in ns3)
+2. create a builder and runtime environment in ns3, a source pkg in ns3 and a function referring to this src pkg also in ns3. (for complete isolation, all objects are in ns3)

 ```bash
 $ fission env create --name python-builder-env --builder fission/python-builder --image fission/python-env --ns3
@@ -62,5 +62,5 @@ $ fission fn create --name func3 --fns ns3 --pkg $pkg --entrypoint "user.main"
 ## Note

 1. To maintain backward compatibility, fission objects that are created without the ns flags are created in default namespace. Also, the run time env pods in such a case will continue to live in fission-function ns and builder env pods in fission-builder ns
-2. Since all envs in a namespace have the same fission-fetcher SA mounted in them, even though multiple envs are created in a namespace and referenced by functions in different namespaces, the SA will have previleges to view those function's secrets if any.
-3. Similarly, if there are multiple functions in different namespaces but all sharing an env in one namespace, the fission-fetcher SA in that namespace will have previleges to see all of their secrets.
+2. Since all envs in a namespace have the same fission-fetcher SA mounted in them, even though multiple envs are created in a namespace and referenced by functions in different namespaces, the SA will have privileges to view those function's secrets if any.
+3. Similarly, if there are multiple functions in different namespaces but all sharing an env in one namespace, the fission-fetcher SA in that namespace will have privileges to see all of their secrets.
@@ -20,5 +20,5 @@ documentation on the context object in each environment.

 ## Kubernetes Watch Event Triggers

-Kubernetes watches can be used to trigger functions.  These functions
+Kubernetes watches can be used to trigger functions. These functions
 receive the Kubernetes watch.Event object in JSON-serialized form.
@@ -48,7 +48,7 @@ So we can write a simple logic - to check if a annotation is applicable for an i

 ### Implementation 2

- One of side effects of this is that the annotations will still stay on the source CRD object - for example annotation will stay on the httptrigger as well as the ingress object. This can cause problems in certain cases where something like Prometheus uses annotations to scrape objects. So instead we wrap the annotations needed by an object into another annotation name. This also solves problem of having to guess which annotations to apply to which object. 
+- One of the side effects is that the annotations will still stay on the source CRD object - for example annotation will stay on the httptrigger as well as the ingress object. This can cause problems in certain cases where something like Prometheus uses annotations to scrape objects. So instead we wrap the annotations needed by an object into another annotation name. This also solves problem of having to guess which annotations to apply to which object. 

 ```yaml
 apiVersion: fission.io/v1
@@ -88,4 +88,4 @@ HTTPTriggerSpec struct {
 ## Final thoughts

 - The implementation idea 2 & 3 look better than 1. The third option involves HTTPTrigger Spec change.
- For both (2) & (3) - if in future we have to implement annotations for Functions etc. we will have to consider the fact that a function will in turn create 3 objects (Service, Pod & HPA) and annotations for all three would need to be accommodated.
+- For both (2) & (3) - if in future we have to implement annotations for Functions etc. we will have to consider the fact that a function will in turn create 3 objects (Service, Pod & HPA) and annotations for all three would need to be accommodated.
@@ -57,7 +57,7 @@ If we look at this from CI/CD perspective this process requires:
  3. Fission CLI
  4. Kubernetes Config so that the apply command can be run

-So if we build a container - which has the above requirements met as installed software (Ex. Fission & Kubectl CLI) or available as environment variable (Github pull token or Kubeconfig), the container can be used as part of CI workflow in any tool such as - Jenkins, Argo, Github Actions, Gitlab etc.
+So if we build a container - which has the above requirements met as installed software (Ex. Fission & Kubectl CLI) or available as environment variable (Github pull token or Kubeconfig), the container can be used as part of CI workflow in any tool such as - Jenkins, Argo, Github Actions, GitLab etc.

 The idea is to build a generic container with Fission CLI, Kubernetes CLI and a way to read Github token and Kubeconfig from env variable/mounted files and being able to run `fission spec apply` command.

@@ -90,7 +90,7 @@ Without changing anything in Fission spec it is possible to change these things
  1. Generate and maintain specs for each environment. This is not a best practice as it leads to drift in code and configuration between environment over time.
  2. Use placeholder variables (i.e. $DB_CONNECTION_VALUE) and replace them for each environment before deploying. This is better in the sense that you are combining changes specific to each environment with spec code but is still a work around sort of.

-For environment specific configurations, it is possible to use some sort of templating or overlay mechanism. One of interesting projects using overlays is [Kustomize](https://github.com/kubernetes-sigs/kustomize). In any case as of today the fission spec command does not have a way to use template or modify values using overlay and it is worth exploring this approach for fission spec.
+For environment specific configurations, it is possible to use some sort of templates or overlay mechanism. One of interesting projects using overlays is [Kustomize](https://github.com/kubernetes-sigs/kustomize). In any case as of today the fission spec command does not have a way to use template or modify values using overlay and it is worth exploring this approach for fission spec.

 ## 3 Promotion from one environment to another

@@ -98,4 +98,4 @@ This necessarily does not fall in the area of Fission per se but it would be fai

 ## Action Items

-As a first step it would be good to build a simple container mentioned in (1) and use it in various tools to understand the value it adds and any unknowns. The next steps would be to build a full end to end pipeline from source to production.
+As a first step it would be good to build a simple container mentioned in (1) and use it in various tools to understand the value it adds and any unknowns. The next steps would be to build a full end to end pipeline from source to production.
@@ -125,4 +125,4 @@ Improving this is probably best left to future work.


 The more heavyweight solution solves some of these limitations to an extent, but these do not way up to the increased 
-development and maintainance cost IMO. If needed we could explore this option (or some hybrid option) in the future.
+development and maintenance cost IMO. If needed we could explore this option (or some hybrid option) in the future.
@@ -46,8 +46,8 @@ directory (in case of deployment packages).

 The load request may contain an EntryPoint. If it does, the loader
 must interpret this; usually it's the name of a function in a module
-or package containing multiple functions. If there is no entrypoint,
-the environment must use a default; again, the value of thsi default
+or package containing multiple functions. If there is no entry point,
+the environment must use a default; again, the value of this default
 is environment-specific.

 The load request may contain a URL. If it does, requests to that URL
@@ -52,11 +52,11 @@ container.
 ### Discussion

 Early feedback shows that almost evey user ends up rebuilding images
-to add some dependecies.  Some sort of automated dependecy resolution
+to add some dependencies.  Some sort of automated dependency resolution
 would be very nice to have and improve the development workflow.  In
 other words, just attach a package.json(nodejs) or
 requirements.txt(python) with a function, and fission will do the
-rest.  There's also the possiblity of supporting buildpacks (simple
+rest.  There's also the possibility of supporting buildpacks (simple
 zipfiles), a la AWS Lambda.

 Though we can support compiled languages by doing the compilation
@@ -82,7 +82,7 @@ use environments, I've already packaged up my function, here it is".
 Roughly in order of priority:

 0. Retain the simplicity of the simple use cases.  First user
-   experience shoud remain trivial -- write a function, map a URL,
+   experience should remain trivial -- write a function, map a URL,
   done.

 1. Support compiled languages. Support error reporting on function
@@ -91,7 +91,7 @@ Roughly in order of priority:
 2. Support functions as a collection of files rather than just one
   file.

-3. Support automated environment-specific dependecy resolution.
+3. Support automated environment-specific dependency resolution.

   (#3 may end up having the same solution as #1.  You could think of
   gathering deps as a "compilation" of package.json,
@@ -297,7 +297,7 @@ affinity rule, but k8s services only support IP based affinity.]

 #### Poolmgr

-Poolmgr remains relatively unchanged.  Instead of contructing URLs for
+Poolmgr remains relatively unchanged.  Instead of constructing URLs for
 function metadata, it uses the deployment package URL in the function
 object.

@@ -9,7 +9,7 @@ A new layer - executor now sits between the router and actual backends are respo

 # Backend

-A backend is responsible for execution of a function - which can involve provisioning appropriate objects in Kubernetes. So with the new design Pool manager becomes one of backends. As of this writing there are two backends which are described as:
+A backend is responsible for execution of a function - which can involve provisioning appropriate objects in Kubernetes. So with the new design Pool manager becomes one of the backends. As of this writing there are two backends which are described as:

 ### Pool Manager Backend

@@ -21,7 +21,7 @@ New Deploy backend create a Kubernetes deployment, a Kubernetes Service for a gi

 ### Execution Strategy

-While this is still a WIP, parameters that affect execution behaviour of function are based on `InvokeStrategy`. A invoke strategy defines the `strategyType` and actual strategy parameters encapsulated in the strategy object. 
+While this is still a WIP, parameters that affect execution behavior of function are based on `InvokeStrategy`. A invoke strategy defines the `strategyType` and actual strategy parameters encapsulated in the strategy object. 

 ```
 InvokeStrategy struct {
@@ -8,7 +8,7 @@ This document documents the design and thoughts that lead to design of Java envi
    - Kotlin (Server side with Spring)

 - In Java there are a few prominent frameworks which have a ecosystem of their own (See list below). How these framework fit in the environment will be detailed later, but it is important to understand their place in ecosystem and design for it.
-    - A large percentage of entertprise developers use [Spring framework](https://spring.io/) as has been shown by multiple surveys
+    - A large percentage of enterprise developers use [Spring framework](https://spring.io/) as has been shown by multiple surveys
    - Reactive has taken up recently with data intensive operations [Reactive extensions for JVM](https://github.com/ReactiveX/RxJava)
    - [Spark](http://sparkjava.com/) is a micro web framework

@@ -31,7 +31,7 @@ Now - the T & R could be different things and we discuss some options below:

 From the early implementation in the branch mentioned above, the environment extracts the body and send it as a JSON string. The JSON then can be transformed into the appropriate object by the function.

-This works well, but has one major limitation: the function does not get access to other things like headers etc. The same thing applies to the reponse: function can send the body but looses control over status code etc.
+This works well, but has one major limitation: the function does not get access to other things like headers etc. The same thing applies to the response: function can send the body but looses control over status code etc.

 ### HttpServletRequest and HttpServletResponse

@@ -64,4 +64,4 @@ The Spring cloud function project also discusses the issue of not having access
 JVM environment design is based on Spring boot and Spring MVC frameworks. The details can be found in branch, but here are some key points:

 - All classes in the function and dependent classes are loaded into JVM. Which means the user should supply the uber/fat jar for execution.
- The entrypoint class is specified by the user as ```entrypoint``` flag on the class. The method is by convention (```apply``` as per the Function interface contract)
+- The entrypoint class is specified by the user as ```entrypoint``` flag on the class. The method is by convention (```apply``` as per the Function interface contract)
@@ -9,7 +9,7 @@ Most of current integration tests are CLI driven. Fission CLI is used to test ex
 This section only explains the problems/best practices without going into tooling and language used for implementation.
 ### Separating the test & data

-Seperating the tests from test data has two aspects - one is separation of concerns and second is scaling the tests without touching the test logic. The test data is a simple data structure which holds all information and test can take data and execute the logic.
+Separating the tests from test data has two aspects - one is separation of concerns and second is scaling the tests without touching the test logic. The test data is a simple data structure which holds all information and test can take data and execute the logic.

 As an example today we test "Hello world" for nodejs environment with a simple hello.js like this:

@@ -36,7 +36,7 @@ And feed it with a dictionary which has all possible combination of tests:
    node: {"fission/node-env", "test/hello.js", "/hellonode"},
    python: {"fission/python-env", "test/hello.py", "/hellopy"},
    golang: {"fission/go-env", "test/hello.go", "/hellogo"},
-    binray: {"fission/binary-env", "test/hello.sh", "/hellobinary"},
+    binary: {"fission/binary-env", "test/hello.sh", "/hellobinary"},
 }

 ```
@@ -63,7 +63,7 @@ The ability to have clean and separate before and after blocks, apart from separ
 - Running a suite of tests for same setup (See tagging for suite of tests)
 ### Tagging tests & running a selection

-Over a period of time as tests grow, there will be unit, smkoe, integration, performance, soak tests and so on. Ability to run a perticular test suite only or a combination of them makes it easy to run for specific purpose. 
+Over a period of time as tests grow, there will be unit, smoke, integration, performance, soak tests and so on. Ability to run a particular test suite only or a combination of them makes it easy to run for specific purpose. 
 ### Measuring test times

 [Good to have, not a must] Measuring time for tests and reporting somewhere helps over time to monitor trends. Although this job is better done by performance/benchmark tests so it is not a strict requirement
@@ -74,7 +74,7 @@ It would be good to have cleaner/relevant logging as part of build & test. For e

 It would be good to be able to run tests in parallel.

-## Evalutaing the tools/alternatives
+## Evaluating the tools/alternatives
 ### BATS

 Bash Automated Testing System is like a enhanced version of bash with support for @test tags and before and after steps & ability to skip tests etc. While it enhances the bash to certain extent, the overall improvement is only marginal.
@@ -111,7 +111,7 @@ https://golang.org/pkg/os/exec

 ### Using CLI package

-Currently we build a CLI and then execute the tests. The tests basically call one of functions from CLI package. If we decide to use a go lang based framework, then we can import the CLI package and then call those functions  by providing them context. This is as good as calling the Fission from CLI, with added benefit of programmibility of Go langugage.
+Currently we build a CLI and then execute the tests. The tests basically call one of functions from CLI package. If we decide to use a go lang based framework, then we can import the CLI package and then call those functions  by providing them context. This is as good as calling the Fission from CLI, with added benefit of programmability of Go language.

 ```
 func TestSomething(t *testing.T) {
@@ -135,7 +135,7 @@ Ginkgo is a BDD framework which works with Gomega matcher library. I will state
 From Ginkgo:

 - Global `BeforeSuite` and after `AfterSuite` can be used to have global setup and tear down phases
- For tests `BeforeEach` and `AfterEach` and more such varients to do before and after test tasks.
+- For tests `BeforeEach` and `AfterEach` and more such variants to do before and after test tasks.

 From Gomega:

@@ -180,7 +180,7 @@ Eventually(session.Out).Should(gbytes.Say("hello [A-Za-z], world"))
 ```
 There are many more matchers which cane be found here: http://onsi.github.io/gomega/#provided-matchers 

- We can build custom mathers in Go language for reusable logic.
+- We can build custom matchers in Go language for reusable logic.

 #### Links
 Ginkgo: http://onsi.github.io/ginkgo/
@@ -199,11 +199,11 @@ Based on the discussion with team, here are current thoughts and next action ite
 - How will migration of tests happen over time:
  - Aim is to keep existing tests around so that enough validation is in place
  - May be migrate one test at a time
-  - How much of current setup etc. will move into framework? For example it is clear that helm commands should be part of test framework as part of setup/teardown. But other sections may or may not be. A RCA needs to be done to analyze and come up with clear demarkation.
+  - How much of current setup etc. will move into framework? For example it is clear that helm commands should be part of test framework as part of setup/teardown. But other sections may or may not be. A RCA needs to be done to analyze and come up with clear demarcation.

 ## References

 - EngineYard uses BATS: https://www.engineyard.com/blog/bats-test-command-line-tools
 - AWS CLI Tests, written in Python (CLI itself is also in Python): https://github.com/aws/aws-cli/tree/develop/tests
 - Kubernetes uses Ginkgo and Gomega extensively: https://github.com/kubernetes/kubernetes/search?l=Go&q=onsi&type=
- Hashicorp's Mitchell's talk on Advanced testing with go talks about some good patterns to use: https://www.youtube.com/watch?v=8hQG7QlcLBk 
+- Hashicorp's Mitchell's talk on Advanced testing with go talks about some good patterns to use: https://www.youtube.com/watch?v=8hQG7QlcLBk 
@@ -14,35 +14,123 @@

 .DEFAULT_GOAL := check

-check: test-run build clean
+# Platforms to build in multi-architecture images.
+PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7

-# run basic check scripts
-test-run:
+# Repository prefix and tag to push multi-architecture images to.
+REPO ?= fission
+TAG ?= dev
+DOCKER_FLAGS ?= --push --progress plain
+
+VERSION ?= master
+TIMESTAMP ?= $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+COMMITSHA ?= $(shell git rev-parse HEAD)
+
+GOOS ?= $(shell go env GOOS)
+GOARCH ?= $(shell go env GOARCH)
+
+BINDIR ?= build/bin
+FISSION-CLI-SUFFIX :=
+ifeq ($(GOOS), windows)
+	FISSION-CLI-SUFFIX := .exe
+endif
+
+GO ?= go
+GO_LDFLAGS := -X github.com/fission/fission/pkg/info.GitCommit=$(COMMITSHA) $(GO_LDFLAGS)
+GO_LDFLAGS := -X github.com/fission/fission/pkg/info.BuildDate=$(TIMESTAMP)  $(GO_LDFLAGS)
+GO_LDFLAGS := -X github.com/fission/fission/pkg/info.Version=$(VERSION) $(GO_LDFLAGS)
+GCFLAGS ?= all=-trimpath=$(CURDIR)
+ASMFLAGS ?= all=-trimpath=$(CURDIR)
+
+### Static checks
+check: test-run build-fission-cli clean
+
+code-checks:
 	hack/verify-gofmt.sh
 	hack/verify-govet.sh
 	hack/verify-staticcheck.sh
+
+# run basic check scripts
+test-run: code-checks
 	hack/runtests.sh
 	@rm -f coverage.txt

-# ensure the changes are buildable
-build:
-	go build -o cmd/fission-bundle/fission-bundle ./cmd/fission-bundle/
-	go build -o cmd/fission-cli/fission ./cmd/fission-cli/
-	go build -o cmd/fetcher/fetcher ./cmd/fetcher/
-	go build -o cmd/fetcher/builder ./cmd/builder/
+### Binaries
+fission-cli:
+	@mkdir -p $(BINDIR)
+	GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) build \
+	-gcflags '$(GCFLAGS)' \
+	-asmflags '$(ASMFLAGS)' \
+	-ldflags "$(GO_LDFLAGS)" \
+	-o $(BINDIR)/fission-$(VERSION)-$(GOOS)-$(GOARCH)$(FISSION-CLI-SUFFIX) ./cmd/fission-cli

-# install CLI binary to $PATH
-install: build
-	mv cmd/fission-cli/fission $(GOPATH)/bin
+all-fission-cli:
+	$(MAKE) fission-cli GOOS=windows GOARCH=amd64
+	$(MAKE) fission-cli GOOS=linux GOARCH=amd64
+	$(MAKE) fission-cli GOOS=linux GOARCH=arm
+	$(MAKE) fission-cli GOOS=linux GOARCH=arm64
+	$(MAKE) fission-cli GOOS=darwin GOARCH=amd64

-# build images (environment images are not included)
-image:
-	docker build -t fission-bundle -f cmd/fission-bundle/Dockerfile.fission-bundle .
-	docker build -t fetcher -f cmd/fetcher/Dockerfile.fission-fetcher .
-	docker build -t builder -f cmd/builder/Dockerfile.fission-builder .
+install-fission-cli: fission-cli
+	mv $(BINDIR)/fission-$(VERSION)-$(GOOS)-$(GOARCH)$(FISSION-CLI-SUFFIX) /usr/local/bin/

+### Container images
+FISSION_IMGS := fission-bundle-multiarch-img \
+	fetcher-multiarch-img \
+	builder-multiarch-img\
+	pre-upgrade-checks-multiarch-img \
+	reporter-multiarch-img
+
+verify-builder:
+	@./hack/buildx.sh $(PLATFORMS)
+
+local-images:
+	PLATFORMS=linux/amd64 $(MAKE) all-images
+
+all-images: verify-builder $(FISSION_IMGS)
+
+fission-bundle-multiarch-img: cmd/fission-bundle/Dockerfile.fission-bundle
+fetcher-multiarch-img: cmd/fetcher/Dockerfile.fission-fetcher
+builder-multiarch-img: cmd/builder/Dockerfile.fission-builder
+pre-upgrade-checks-multiarch-img: cmd/preupgradechecks/Dockerfile.fission-preupgradechecks
+reporter-multiarch-img: cmd/reporter/Dockerfile.reporter
+
+%-multiarch-img:
+	@echo === Building image $(REPO)/$(subst -multiarch-img,,$@):$(TAG) using context $(CURDIR) and dockerfile $<
+	docker buildx build --platform=$(PLATFORMS) -t $(REPO)/$(subst -multiarch-img,,$@):$(TAG) \
+		--build-arg GITCOMMIT=$(COMMITSHA) \
+    	--build-arg BUILDDATE=$(TIMESTAMP) \
+		--build-arg BUILDVERSION=$(VERSION) \
+	 	$(DOCKER_FLAGS) -f $< .
+
+### CRDs
+generate-crds:
+	controller-gen crd:trivialVersions=false,preserveUnknownFields=false  \
+	paths=./pkg/apis/core/v1  \
+	output:crd:artifacts:config=crds/v1
+
+create-crds:
+	@kubectl create -k crds/v1
+
+update-crds:
+	@kubectl replace -k crds/v1
+
+delete-crds:
+	@kubectl delete -k crds/v1
+
+### Cleanup
 clean:
 	@rm -f cmd/fission-bundle/fission-bundle
 	@rm -f cmd/fission-cli/fission
 	@rm -f cmd/fetcher/fetcher
 	@rm -f cmd/fetcher/builder
+	@rm -f cmd/reporter/reporter
+	@rm -f pkg/apis/core/v1/types_swagger_doc_generated.go
+
+### Misc
+generate-swagger-doc:
+	@cd pkg/apis/core/v1/tool && ./update-generated-swagger-docs.sh
+
+make release:
+	@./hack/release.sh $(VERSION)
+	@./hack/releas-tag.sh $(VERSION)
@@ -1,10 +1,24 @@
-# Fission: Serverless Functions for Kubernetes
+<p align="center">
+  <img src="https://docs.fission.io/images/logo.png" width="300" />
+  <br>
+  <h1 align="center">Fission: Serverless Functions for Kubernetes</h1>
+</p>
+<p align="center">
+  <a href="https://github.com/fission/fission/actions?query=workflow%3A%22Fission+CI%22">
+    <img src="https://github.com/fission/fission/workflows/Fission%20CI/badge.svg?branch=master" alt="Build Status" />
+  </a>
+  
+  <a href="https://goreportcard.com/report/github.com/fission/fission">
+    <img src="https://goreportcard.com/badge/github.com/fission/fission" alt="Go Report Card" />
+  </a>
+  <a href="https://codecov.io/gh/fission/fission">
+    <img src="https://codecov.io/gh/fission/fission/branch/master/graph/badge.svg" alt="codecov" />
+  </a>
+  <br>
+  <a href="http://fission.io">fission.io</a> | <a href="http://twitter.com/fissionio">@fissionio</a> | <a href="https://join.slack.com/t/fissionio/shared_invite/enQtOTI3NjgyMjE5NzE3LTllODJiODBmYTBiYWUwMWQxZWRhNDhiZDMyN2EyNjAzMTFiYjE2Nzc1NzE0MTU4ZTg2MzVjMDQ1NWY3MGJhZmE">Slack</a>
+</p>

-[![Build Status](https://travis-ci.org/fission/fission.svg?branch=master)](https://travis-ci.org/fission/fission)
-[![Go Report Card](https://goreportcard.com/badge/github.com/fission/fission)](https://goreportcard.com/report/github.com/fission/fission)
-[![Fission Slack](http://slack.fission.io/badge.svg)](http://slack.fission.io)
-
-[fission.io](http://fission.io) [@fissionio](http://twitter.com/fissionio)
+--------------

 Fission is a fast serverless framework for Kubernetes with a focus on
 developer productivity and high performance.
@@ -18,7 +32,21 @@ language-specific parts are isolated in something called
 _environments_ (more below).  Fission currently supports NodeJS, Python, Ruby, Go, 
 PHP, Bash, and any Linux executable, with more languages coming soon.

-# Performance: 100msec cold start
+Table of Contents
+=================
+
+   * [Fission: Serverless Functions for Kubernetes](#fission-serverless-functions-for-kubernetes)
+      * [Performance: 100msec cold start](#performance-100msec-cold-start)
+      * [Kubernetes is the right place for Serverless](#kubernetes-is-the-right-place-for-serverless)
+      * [Getting Started](#getting-started)
+      * [Learn More](#learn-more)
+      * [Contributing](#contributing)
+      * [Get Help &amp; Community Meeting](#get-help--community-meeting)
+      * [Official Releases](#official-releases)
+      * [Sponsors](#sponsors)
+   * [Licensing](#licensing)
+
+## Performance: 100msec cold start

 Fission maintains a pool of "warm" containers that each contain a
 small dynamic loader.  When a function is first called,
@@ -26,7 +54,7 @@ i.e. "cold-started", a running container is chosen and the function is
 loaded.  This pool is what makes Fission fast: cold-start latencies
 are typically about 100msec.

-# Kubernetes is the right place for Serverless
+## Kubernetes is the right place for Serverless

 We're built on Kubernetes because we think any non-trivial app will
 use a combination of serverless functions and more conventional
@@ -37,59 +65,59 @@ Building on Kubernetes also means that anything you do for operations
 on your Kubernetes cluster &mdash; such as monitoring or log
 aggregation &mdash; also helps with ops on your Fission deployment.

-# Getting started and documentation
-
-## Fission Concepts
-
-Visit [concepts](https://docs.fission.io/docs/concepts/) for more details.
-
-## Documentations
-
-You can learn more about Fission and get started from [Fission Docs](https://docs.fission.io/docs).
-* See the [installation guide](https://docs.fission.io/docs/installation/) for installing and running Fission.
-* See the [troubleshooting guide](https://docs.fission.io/docs/trouble-shooting/) for debugging your functions and Fission installation.
-
-## Usage
+## Getting Started

 ```bash
  # Add the stock NodeJS env to your Fission deployment
  $ fission env create --name nodejs --image fission/node-env

-  # A javascript one-liner that prints "hello world"
-  $ curl https://raw.githubusercontent.com/fission/fission/master/examples/nodejs/hello.js > hello.js
-
-  # Upload your function code to fission
-  $ fission function create --name hello --env nodejs --code hello.js
-
-  # Map GET /hello to your new function
-  $ fission route create --method GET --url /hello --function hello
+  # Create a function with a javascript one-liner that prints "hello world"
+  $ fission function create --name hello --env nodejs --code https://raw.githubusercontent.com/fission/examples/master/nodejs/hello.js

  # Run the function.  This takes about 100msec the first time.
  $ fission function test --name hello
  Hello, world!
 ```

-# Contributing
+## Learn More

-## Building Fission
-See the [compilation guide](https://docs.fission.io/docs/contributing/).
+* Understand [Fission Concepts](https://docs.fission.io/docs/concepts/).
+* See the [installation guide](https://docs.fission.io/docs/installation/) for installing and running Fission.
+* You can learn more about Fission and get started from [Fission Docs](https://docs.fission.io/docs).
+* See the [troubleshooting guide](https://docs.fission.io/docs/trouble-shooting/) for debugging your functions and Fission installation.

-## Contact
-Reach us on [slack](http://slack.fission.io) or [twitter](https://twitter.com/fissionio).
+## Contributing
+
+Check out the [contributing guide](CONTRIBUTING.md).
+
+## Get Help & Community Meeting 

 Fission is a project by [many contributors](https://github.com/fission/fission/graphs/contributors).
+Reach us on [slack](https://join.slack.com/t/fissionio/shared_invite/enQtOTI3NjgyMjE5NzE3LTllODJiODBmYTBiYWUwMWQxZWRhNDhiZDMyN2EyNjAzMTFiYjE2Nzc1NzE0MTU4ZTg2MzVjMDQ1NWY3MGJhZmE) or [twitter](https://twitter.com/fissionio).

-## Community meeting 
+A regular community meeting takes place every other Thursday at 09:00 AM PT (Pacific Time). [Convert to your local timezone](http://www.thetimezoneconverter.com/?t=09:00&tz=PT%20%28Pacific%20Time%29).

-A regular community meeting takes place every other Thursday at 08:30 AM PT (Pacific Time). [Convert to your local timezone](http://www.thetimezoneconverter.com/?t=08:30&tz=PT%20%28Pacific%20Time%29).
+Meeting Link: https://zoom.us/j/413921817 

-# Official Releases
+The meeting agenda for next meeting and notes from past meetings are maintained in [this document](https://docs.google.com/document/d/1E-xw4KJgka4sUpETHxr9BJBYntzrtxlAN_CE3Wt8kws). You are welcome to join to discuss direction of project, design and implementation reviews and general questions about project etc.
+
+## Official Releases

 Official releases of Fission can be found on [the releases page](https://github.com/fission/fission/releases). 
 Please note that it is strongly recommended that you use official releases of Fission, as unreleased versions from 
 the master branch are subject to changes and incompatibilities that will not be supported in the official releases. 
-Builds from the master branch can have functionality changed and even removed at any time without compatibility support 
-and without prior notice.
+
+## Sponsors
+
+The following companies, organizations, and individuals support Fission's ongoing maintenance and development. If you are using/contributing to Fission, we would be happy to list you here, please raise a Pull request.
+
+<p>
+    <a href="https://infracloud.io/"><img src="https://fission.io/sponsors/infracloud.png" alt="InfraCloud" height="70"></a>
+    <a href="https://srcmesh.com/"><img src="https://fission.io/sponsors/srcmesh.png" alt="Srcmesh" height="70"></a>
+    <a href="https://www.digitalocean.com/?utm_medium=opensource&utm_source=fissionio">
+      <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg" width="201px">
+    </a>
+</p>

 # Licensing

@@ -43,10 +43,10 @@ Parameter | Description | Default
 `routerServiceType` | Type of Fission Router service to use. For minikube, set this to NodePort, elsewhere use LoadBalancer or ClusterIP. | `LoadBalancer`
 `repository` | Image base repository | `index.docker.io`
 `image` | Fission image repository | `fission/fission-bundle`
-`imageTag` | Fission image tag | `1.7.0`
+`imageTag` | Fission image tag | `1.13.0`
 `pullPolicy` | Image pull policy | `IfNotPresent`
-`fetcherImage` | Fission fetcher repository | `fission/fetcher`
-`fetcherImageTag` | Fission fetcher image tag | `1.7.0`
+`fetcher.image` | Fission fetcher repository | `fission/fetcher`
+`fetcher.imageTag` | Fission fetcher image tag | `1.13.0`
 `controllerPort` | Fission Controller service port | `31313`
 `routerPort` | Fission Router service port | ` 31314`
 `functionNamespace` | Namespace in which to run fission functions (this is different from the release namespace) | `fission-function`
@@ -68,6 +68,7 @@ Parameter | Description | Default
 `extraCoreComponentPodConfig` | Extend the container specs for the core fission pods. Can be used to add things like affinty/tolerations/nodeSelectors/etc. | None
 `executor.adoptExistingResources` | If true, executor will try to adopt existing resources created by the old executor instance. | `false`
 `router.deployAsDaemonSet` | Deploy router as DaemonSet instead of Deployment | `false`
+`router.extraCoreComponentPodConfig` | Extend the container specs for the router fission pods. Can be used to add things like affinty/tolerations/nodeSelectors/etc. Overrides the generic `extraCoreComponentPodConfig`| None
 `router.svcAddressMaxRetries` | Max retries times for router to retry on a certain service URL returns from cache/executor | `5`
 `router.svcAddressUpdateTimeout` | The length of update lock expiry time for router to get a service URL returns from executor | `30`
 `router.svcAnnotations` | Annotations for router service | None
@@ -89,8 +90,12 @@ Parameter | Description | Default
 `logger.fluentdImage` | Logger fluentbit image | `fluent/fluent-bit`
 `logger.fluentdImageTag` | Logger fluentbit image tag | `1.0.4`
 `nats.enabled` | Nats streaming enabled | `true`
+`nats.external` | Use external Nats installation | `false`
+`nats.hostaddress` | Address of NATS cluster | `nats-streaming:4222`
 `nats.authToken` | Nats streaming auth token | `defaultFissionAuthToken`
 `nats.clusterID` | Nats streaming clusterID | `fissionMQTrigger`
+`nats.clientID`  | Client name registered with nats streaming | `fission`
+`nats.queueGroup` | Queue group registered with nats streaming | `fission-messageQueueNatsTrigger`
 `natsStreamingPort` | Nats streaming service port | `31316`
 `azureStorageQueue.enabled` | Azure storage account name | `false`
 `azureStorageQueue.key` | Azure storage account name | `""`
@@ -0,0 +1,6 @@
+dependencies:
+- name: prometheus
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 13.2.1
+digest: sha256:136360a97bdc11f1933d75bab77728acc75dd9583257b973cb3336b6d136c9b6
+generated: "2021-05-27T18:51:04.509283+05:30"
@@ -1,15 +1,21 @@
-apiVersion: v1
+apiVersion: v2
 name: fission-all
-version: 1.7.0
+version: 1.13.0
 description: Fission is a fast serverless framework for Kubernetes.
 keywords:
 - fission
 - serverless
-home: http://fission.io/
+home: https://fission.io/
 maintainers:
-  - name: Soam Vasani
-    email: soamvasani+1@gmail.com
-  - name: Ta Ching Chen
-    email: hello@tachingchen.com
+  - name: Vishal Biyani
+    email: vishal@infracloud.io
+  - name: Sanket Sudake
+    email: sanket@infracloud.io
 engine: gotpl
-appVersion: 1.7.0
+appVersion: 1.13.0
+type: application
+dependencies:
+  - name: prometheus
+    version: 13.2.1
+    repository: https://prometheus-community.github.io/helm-charts
+    condition: prometheus.enabled
@@ -16,7 +16,8 @@

 [FILTER]
    Name kubernetes
-    Match log.*
+    Match *
+    Kube_Tag_Prefix  log.var.log.fission.
    Kube_URL https://kubernetes.default.svc.cluster.local:443

 #
@@ -1,6 +0,0 @@
-dependencies:
- name: prometheus
-  repository: https://kubernetes-charts.storage.googleapis.com
-  version: 9.3.1
-digest: sha256:89a63a5f01c08032106a94c59fc7a5929e449458bf5fd06d86c8b048ac628bf4
-generated: "2019-11-18T10:16:20.334338911Z"
@@ -1,5 +0,0 @@
-dependencies:
-  - name: prometheus
-    version: 9.3.1
-    repository: https://kubernetes-charts.storage.googleapis.com
-    condition: prometheus.enabled
@@ -1,13 +1,13 @@
 1. Install the client CLI.

 Mac:
-  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-cli-osx && chmod +x fission && sudo mv fission /usr/local/bin/
+  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-{{ .Chart.Version }}-darwin-amd64 && chmod +x fission && sudo mv fission /usr/local/bin/

 Linux:
-  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-cli-linux && chmod +x fission && sudo mv fission /usr/local/bin/
+  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-{{ .Chart.Version }}-linux-amd64 && 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/{{ .Chart.Version }}/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/{{ .Chart.Version }}/fission-{{ .Chart.Version }}-windows-amd64.exe

 2. You're ready to use Fission!

@@ -15,7 +15,7 @@ Windows:
  $ fission env create --name nodejs --image fission/node-env

  # Get a hello world
-  $ curl https://raw.githubusercontent.com/fission/fission/master/examples/nodejs/hello.js > hello.js
+  $ curl https://raw.githubusercontent.com/fission/examples/master/nodejs/hello.js > hello.js

  # Register this function with Fission
  $ fission function create --name hello --env nodejs --code hello.js
@@ -38,8 +38,16 @@ This template generates the image name for the deployment depending on the value
 */}}
 {{- define "fission-bundleImage" -}}
 {{- if .Values.repository -}}
+  {{- if eq .Values.imageTag "" -}}
+    {{ .Values.repository }}/{{ .Values.image }}
+  {{- else -}}
    {{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}
+  {{- end }}
 {{- else -}}
-    {{ .Values.image }}:{{ .Values.imageTag }}    
+  {{- if eq .Values.imageTag "" -}}
+    {{ .Values.image }}
+  {{- else -}}
+    {{ .Values.image }}:{{ .Values.imageTag }}
+  {{- end }}
 {{- end }}
 {{- end -}}
@@ -49,9 +49,113 @@ rules:
  resources:
  - packages
  verbs:
+  - '*'
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  verbs:
+  - '*'
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: fission-cr-admin
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - pods
+  - secrets
+  - services
+  - serviceaccounts
+  - namespaces
+  - events
+  verbs:
+  - create
+  - delete
  - get
-  - watch
  - list
+  - watch
+  - patch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - deployments/scale
+  verbs:
+  - '*'
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - watch
+  - patch
+- apiGroups:
+  - fission.io
+  resources:
+  - canaryconfigs
+  - environments
+  - functions
+  - httptriggers
+  - kuberneteswatchtriggers
+  - messagequeuetriggers
+  - packages
+  - timetriggers
+  verbs:
+  - '*'
+- apiGroups:
+  - autoscaling
+  resources:
+  - horizontalpodautoscalers
+  verbs:
+  - '*'
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  verbs:
+  - '*'
+- apiGroups: ["rbac.authorization.k8s.io"]
+  resources: ["clusterroles"]
+  verbs: ["bind"]
+- apiGroups:
+  - keda.sh
+  resources:
+  - scaledjobs
+  - scaledobjects
+  - scaledjobs/finalizers
+  - scaledjobs/status
+  - triggerauthentications
+  - triggerauthentications/status
+  verbs:
+  - '*'
+- apiGroups:
+  - keda.k8s.io
+  resources:
+  - scaledjobs
+  - scaledobjects
+  - scaledjobs/finalizers
+  - scaledjobs/status
+  - triggerauthentications
+  - triggerauthentications/status
+  verbs:
+  - '*'
+- apiGroups:
+  - metrics.k8s.io
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+

 ---
 apiVersion: v1
@@ -86,7 +190,7 @@ subjects:
  namespace: {{ .Release.Namespace }}
 roleRef:
  kind: ClusterRole
-  name: cluster-admin
+  name: fission-cr-admin
  apiGroup: rbac.authorization.k8s.io

 ---
@@ -95,6 +199,59 @@ kind: ServiceAccount
 metadata:
  name: fission-fetcher
  namespace: {{ .Values.functionNamespace }}
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: fission-fetcher
+  namespace: default
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - secrets
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - '*'
+- apiGroups:
+  - fission.io
+  resources:
+  - canaryconfigs
+  - environments
+  - functions
+  - httptriggers
+  - kuberneteswatchtriggers
+  - messagequeuetriggers
+  - packages
+  - timetriggers
+  verbs:
+  - '*'
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: fission-fetcher
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: fission-fetcher
+subjects:
+- kind: ServiceAccount
+  name: fission-fetcher
+  namespace: {{ .Values.functionNamespace }}
+
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -102,6 +259,42 @@ metadata:
  name: fission-builder
  namespace: {{ .Values.builderNamespace }}

+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: fission-builder
+  namespace: default
+rules:
+- apiGroups:
+  - fission.io
+  resources:
+  - canaryconfigs
+  - environments
+  - functions
+  - httptriggers
+  - kuberneteswatchtriggers
+  - messagequeuetriggers
+  - packages
+  - timetriggers
+  verbs:
+  - '*'
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: fission-builder
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: fission-builder
+subjects:
+- kind: ServiceAccount
+  name: fission-builder
+  namespace: {{ .Values.builderNamespace }}
+
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -210,13 +403,19 @@ spec:
        args: ["--executorPort", "8888", "--namespace", "{{ .Values.functionNamespace }}"]
        env:
        - name: FETCHER_IMAGE
-          value: "{{ .Values.fetcherImage }}:{{ .Values.fetcherImageTag }}"
+        {{- if eq .Values.fetcher.imageTag "" }}
+          value: "{{ .Values.fetcher.image }}"
+        {{- else }}
+          value: "{{ .Values.fetcher.image }}:{{ .Values.fetcher.imageTag }}"
+        {{- end }}
        - name: FETCHER_IMAGE_PULL_POLICY
          value: "{{ .Values.pullPolicy }}"
        - name: RUNTIME_IMAGE_PULL_POLICY
          value: "{{ .Values.pullPolicy }}"
        - name: ADOPT_EXISTING_RESOURCES
          value: {{ .Values.executor.adoptExistingResources | default false | quote }}
+        - name: POD_READY_TIMEOUT
+          value: {{ .Values.executor.podReadyTimeout | default false | quote }}
        - name: ENABLE_ISTIO
          value: "{{ .Values.enableIstio }}"
        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
@@ -224,13 +423,13 @@ spec:
        - name: TRACING_SAMPLING_RATE
          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
        - name: FETCHER_MINCPU
-          value: {{ .Values.fetcherMinCpu | default "10m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.requests | quote }}
        - name: FETCHER_MINMEM
-          value: {{ .Values.fetcherMinMem | default "16Mi" | quote }}
+          value: {{ .Values.fetcher.resource.mem.requests | quote }}
        - name: FETCHER_MAXCPU
-          value: {{ .Values.fetcherMaxCpu | default "1000m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.limits | quote }}
        - name: FETCHER_MAXMEM
-          value: {{ .Values.fetcherMaxMem | default "128Mi" | quote }}
+          value: {{ .Values.fetcher.resource.mem.limits | quote }}
        - name: DEBUG_ENV
          value: {{ .Values.debugEnv | quote }}
        readinessProbe:
@@ -282,7 +481,11 @@ spec:
        args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
        env:
        - name: FETCHER_IMAGE
-          value: "{{ .Values.fetcherImage }}:{{ .Values.fetcherImageTag }}"
+        {{- if eq .Values.fetcher.imageTag "" }}
+          value: "{{ .Values.fetcher.image }}"
+        {{- else }}
+          value: "{{ .Values.fetcher.image }}:{{ .Values.fetcher.imageTag }}"
+        {{- end }}
        - name: FETCHER_IMAGE_PULL_POLICY
          value: "{{ .Values.pullPolicy }}"
        - name: BUILDER_IMAGE_PULL_POLICY
@@ -294,13 +497,13 @@ spec:
        - name: TRACING_SAMPLING_RATE
          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
        - name: FETCHER_MINCPU
-          value: {{ .Values.fetcherMinCpu | default "10m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.requests | quote }}
        - name: FETCHER_MINMEM
-          value: {{ .Values.fetcherMinMem | default "16Mi" | quote }}
+          value: {{ .Values.fetcher.resource.mem.requests | quote }}
        - name: FETCHER_MAXCPU
-          value: {{ .Values.fetcherMaxCpu | default "1000m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.limits | quote }}
        - name: FETCHER_MAXMEM
-          value: {{ .Values.fetcherMaxMem | default "128Mi" | quote }}
+          value: {{ .Values.fetcher.resource.mem.limits | quote }}
        - name: DEBUG_ENV
          value: {{ .Values.debugEnv | quote }}
      serviceAccountName: fission-svc
@@ -343,7 +546,7 @@ spec:
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
-
+{{- if .Values.influxdb.enabled }}
 ---
 apiVersion: v1
 kind: Service
@@ -380,17 +583,17 @@ spec:
    spec:
      containers:
      - name: influxdb
-        image: fission/influxdb
+        image: {{ .Values.influxdb.image | quote }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        env:
-        - name: PRE_CREATE_DB
+        - name: INFLUXDB_DB
          value: fissionFunctionLog
-        - name: ADMIN_USER
+        - name: INFLUXDB_ADMIN_USER
          valueFrom:
            secretKeyRef:
              name: influxdb
              key: username
-        - name: INFLUXDB_INIT_PWD
+        - name: INFLUXDB_ADMIN_PASSWORD
          valueFrom:
            secretKeyRef:
              name: influxdb
@@ -398,7 +601,7 @@ spec:
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
-
+{{- end }}
 {{- if .Values.heapster }}
 ---
 apiVersion: v1
@@ -507,6 +710,13 @@ spec:
 #      serviceAccountName: fission-svc

 {{- if .Values.nats.enabled }}
+{{- if not .Values.nats.external }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: fission-nats-streaming
+  namespace: {{ .Release.Namespace }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -524,9 +734,10 @@ spec:
      labels:
        svc: nats-streaming
    spec:
+      serviceAccount: fission-nats-streaming
      containers:
      - name: nats-streaming
-        image: nats-streaming
+        image: {{ .Values.nats.streamingserver.image | quote }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        args: [
          "--cluster_id", "{{ .Values.nats.clusterID }}",
@@ -555,6 +766,7 @@ spec:
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+{{- end }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -585,8 +797,18 @@ spec:
        env:
        - name: MESSAGE_QUEUE_TYPE
          value: nats-streaming
+        - name: MESSAGE_QUEUE_CLUSTER_ID
+          value: {{ .Values.nats.clusterID }}
+        - name: MESSAGE_QUEUE_QUEUE_GROUP
+          value: {{ .Values.nats.queueGroup }}
+        - name: MESSAGE_QUEUE_CLIENT_ID
+          value: {{ .Values.nats.clientID }}
        - name: MESSAGE_QUEUE_URL
-          value: nats://{{ .Values.nats.authToken }}@nats-streaming:4222
+        {{- if .Values.nats.authToken }}
+          value: nats://{{ .Values.nats.authToken }}@{{ .Values.nats.hostaddress }}
+        {{- else }}
+          value: nats://{{ .Values.nats.hostaddress }}
+        {{- end }}
        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
          value: "{{ .Values.traceCollectorEndpoint }}"
        - name: TRACING_SAMPLING_RATE
@@ -623,7 +845,11 @@ spec:
    spec:
      containers:
      - name: mqtrigger
+      {{- if eq .Values.imageTag "" }}
+        image: "{{ .Values.image }}"
+      {{- else }}
        image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+      {{- end }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        command: ["/fission-bundle"]
        args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
@@ -646,7 +872,9 @@ spec:
        - name: TLS_ENABLED
          value: "true"
        - name: MESSAGE_QUEUE_SECRETS
-          value: /etc/fission/secrets        
+          value: /etc/fission/secrets
+        - name: INSECURE_SKIP_VERIFY
+          value: "{{ .Values.kafka.authentication.tls.insecureSkipVerify }}"
        volumeMounts:
        - name: kafka-secrets
          mountPath: /etc/fission/secrets
@@ -713,7 +941,11 @@ spec:
    spec:
      containers:
      - name: mqtrigger
+      {{- if eq .Values.imageTag "" }}
+        image: "{{ .Values.image }}"
+      {{- else }}
        image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+      {{- end }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        command: ["/fission-bundle"]
        args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
@@ -764,7 +996,11 @@ spec:
        image: {{ include "fission-bundleImage" . | quote }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        command: ["/fission-bundle"]
-        args: ["--storageServicePort", "8000", "--filePath", "/fission"]
+        {{- if and (.Values.persistence.enabled) (eq (.Values.persistence.storageType | default "local") "s3") }}
+        args: ["--storageServicePort", "8000", "--storageType", "s3"]
+        {{- else }}
+        args: ["--storageServicePort", "8000", "--storageType", "local"]
+        {{- end }}
        env:
        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
          value: "{{ .Values.traceCollectorEndpoint }}"
@@ -774,9 +1010,25 @@ spec:
          value: "{{.Values.pruneInterval}}"
        - name: DEBUG_ENV
          value: {{ .Values.debugEnv | quote }}
+        {{- if and (.Values.persistence.enabled) (eq (.Values.persistence.storageType | default "local") "s3") }}
+        - name: STORAGE_S3_ENDPOINT
+          value: {{ .Values.persistence.s3.endPoint }}
+        - name: STORAGE_S3_BUCKET_NAME
+          value: {{ .Values.persistence.s3.bucketName }}
+        - name: STORAGE_S3_SUB_DIR
+          value: {{ .Values.persistence.s3.subDir }}
+        - name: STORAGE_S3_ACCESS_KEY_ID
+          value: {{ .Values.persistence.s3.accessKeyId }}
+        - name: STORAGE_S3_SECRET_ACCESS_KEY
+          value: {{ .Values.persistence.s3.secretAccessKey }}
+        - name: STORAGE_S3_REGION
+          value: {{ .Values.persistence.s3.region }}
+        {{- end }}
+        {{- if ne (.Values.persistence.storageType | default "local") "s3" }}
        volumeMounts:
        - name: fission-storage
          mountPath: /fission
+        {{- end }}
        readinessProbe:
          httpGet:
            path: "/healthz"
@@ -794,14 +1046,99 @@ spec:
          - containerPort: 8000
            name: http
      serviceAccountName: fission-svc
+      {{- if and (.Values.persistence.enabled) (ne (.Values.persistence.storageType | default "local") "s3") }}
      volumes:
      - name: fission-storage
-      {{- if .Values.persistence.enabled }}
        persistentVolumeClaim:
          claimName: {{ .Values.persistence.existingClaim | default "fission-storage-pvc" }}
      {{- else }}
+      volumes:
+      - name: fission-storage
        emptyDir: {}
      {{- end }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+
+{{- if .Values.mqt_keda.enabled }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mqtrigger-keda
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    svc: mqtrigger-keda
+    messagequeue: keda
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      svc: mqtrigger-keda
+      messagequeue: keda
+  template:
+    metadata:
+      labels:
+        svc: mqtrigger-keda
+        messagequeue: keda
+    spec:
+      containers:
+      - name:  mqtrigger-keda
+        image: {{ include "fission-bundleImage" . | quote }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        command: ["/fission-bundle"]
+        args: ["--mqt_keda", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
+        env:
+        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
+          value: "{{ .Values.traceCollectorEndpoint }}"
+        - name: TRACING_SAMPLING_RATE
+          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
+        - name: DEBUG_ENV
+          value: {{ .Values.debugEnv | quote }}
+        - name: CONNECTOR_IMAGE_PULL_POLICY
+          value: "{{ .Values.pullPolicy }}"
+        - name: KAFKA_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.kafka.image }}:{{ .Values.mqt_keda.connector_images.kafka.tag }}"
+        - name: RABBITMQ_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.rabbitmq.image }}:{{ .Values.mqt_keda.connector_images.rabbitmq.tag }}"
+        - name: AWS-KINESIS-STREAM_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.awskinesis.image }}:{{ .Values.mqt_keda.connector_images.awskinesis.tag }}"
+        - name: AWS-SQS-QUEUE_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.aws_sqs.image }}:{{ .Values.mqt_keda.connector_images.aws_sqs.tag }}"
+        - name: STAN_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.nats_steaming.image }}:{{ .Values.mqt_keda.connector_images.nats_steaming.tag }}"
+        - name: GCP-PUB-SUB_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.gcp_pub_sub.image }}:{{ .Values.mqt_keda.connector_images.gcp_pub_sub.tag }}"
+      serviceAccountName: fission-svc
+{{- if .Values.extraCoreComponentPodConfig }}
+{{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
+{{- end }}
+{{- end }}
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ .Values.functionNamespace }}
+  name: event-fetcher
+rules:
+- apiGroups: [""] # "" indicates the core API group
+  resources: ["pods"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: [""] # "" indicates the core API group
+  resources: ["events"]
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: fission-fetcher-pod-reader
+  namespace: {{ .Values.functionNamespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: event-fetcher
+subjects:
+- kind: ServiceAccount
+  name: fission-fetcher
+  namespace: {{ .Values.functionNamespace }}
@@ -19,6 +19,64 @@ data:
 {{ else }}
 {{ fail "invalid chart" }}
 {{- end }}
+{{- if .Values.logger.podSecurityPolicy.enabled }}
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ .Release.Name }}-fission-logger-privileged
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    svc: logger
+spec:
+  privileged: true
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  runAsUser:
+    rule: RunAsAny
+  fsGroup:
+    rule: RunAsAny
+  volumes:
+  - '*'
+  {{- if .Values.logger.podSecurityPolicy.additionalCapabilities }}
+  allowedCapabilities:
+  {{- range .Values.logger.podSecurityPolicy.additionalCapabilities }}
+  - {{ . }}
+  {{- end }}
+  {{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: psp:{{ .Release.Name }}-fission-logger-privileged
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    svc: logger
+rules:
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ .Release.Name }}-fission-logger-privileged
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: psp:{{ .Release.Name }}-fission-logger-privileged
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    svc: logger
+roleRef:
+  kind:     Role
+  name:     psp:{{ .Release.Name }}-fission-logger-privileged
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+- kind:      ServiceAccount
+  name:      default
+  namespace: {{ .Release.Namespace }}
+{{- end }}
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -38,7 +96,7 @@ spec:
    spec:
      initContainers:
        - name: init
-          image: busybox
+          image: {{ .Values.busyboxImage | quote }}
          imagePullPolicy: {{ .Values.pullPolicy }}
          command: ['mkdir', '-p', '/var/log/fission']
          volumeMounts:
@@ -51,11 +109,7 @@ spec:
 {{- end }}
      containers:
        - name: logger
-{{ if .Values.repository }}
-          image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
-{{ else }}
-          image: "{{ .Values.image }}:{{ .Values.imageTag }}"
-{{ end }}
+          image: {{ include "fission-bundleImage" . | quote }}
          imagePullPolicy: {{ .Values.pullPolicy }}
          env:
            - name: NODE_NAME
@@ -26,7 +26,16 @@ spec:
      restartPolicy: Never
      containers:
        - name: post-install-job
-          image: "fission/alpinecurl"
+        {{- if .Values.imageTag }}
+          image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+        {{- else }}
+          image: {{ .Values.postInstallReportImage }}
+        {{- end }}
          imagePullPolicy: {{ .Values.pullPolicy }}
-          command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"yaml-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"]
+          command: [ "/reporter" ]
+          args: ["event", "-c", "fission-use", "-a", "yaml-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
+          env:
+            - name: GA_TRACKING_ID
+              value: "{{ .Values.gaTrackingID }}"
+      serviceAccountName: fission-svc
 {{- end }}
@@ -30,7 +30,16 @@ spec:
      restartPolicy: Never
      containers:
        - name: post-install-job
-          image: "fission/alpinecurl"
+        {{- if .Values.imageTag }}
+          image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+        {{- else }}
+          image: {{ .Values.postInstallReportImage }}
+        {{- end }}
          imagePullPolicy: {{ .Values.pullPolicy }}
-          command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"]
+          command: [ "/reporter" ]
+          args: ["event", "-c", "fission-use", "-a", "helm-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
+          env:
+            - name: GA_TRACKING_ID
+              value: "{{ .Values.gaTrackingID }}"
+      serviceAccountName: fission-svc
 {{- end }}
@@ -30,7 +30,16 @@ spec:
      restartPolicy: Never
      containers:
        - name: post-upgrade-job
-          image: "fission/alpinecurl"
+        {{- if .Values.imageTag }}
+          image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+        {{- else }}
+          image: {{ .Values.postInstallReportImage }}
+        {{- end }}
          imagePullPolicy: {{ .Values.pullPolicy }}
-          command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-upgrade\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"]
+          command: [ "/reporter" ]
+          args: ["event", "-c", "fission-use", "-a", "helm-post-upgrade", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
+          env:
+            - name: GA_TRACKING_ID
+              value: "{{ .Values.gaTrackingID }}"
+      serviceAccountName: fission-svc
 {{- end }}
@@ -26,7 +26,11 @@ spec:
      restartPolicy: Never
      containers:
      - name: pre-upgrade-job
+      {{- if .Values.imageTag }}
        image: {{ .Values.preUpgradeChecksImage }}:{{ .Values.imageTag }}
+      {{- else }}
+        image: {{ .Values.preUpgradeChecksImage }}
+      {{- end }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        command: [ "/pre-upgrade-checks" ]
        args: ["--fn-pod-namespace", "{{ .Values.functionNamespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
@@ -1,4 +1,4 @@
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+{{- if and (.Values.persistence.enabled) (not .Values.persistence.existingClaim) (eq (.Values.persistence.storageType | default "local") "local") }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -53,6 +53,8 @@ spec:
            value: {{ .Values.router.svcAddressMaxRetries | default 5 | quote }}
          - name: ROUTER_SVC_ADDRESS_UPDATE_TIMEOUT
            value: {{ .Values.router.svcAddressUpdateTimeout | default "30s" | quote }}
+          - name: ROUTER_UNTAP_SERVICE_TIMEOUT
+            value: {{ .Values.router.unTapServiceTimeout | default "3600s" | quote }}
          - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
            value: "{{ .Values.traceCollectorEndpoint }}"
          - name: TRACING_SAMPLING_RATE
@@ -63,13 +65,8 @@ spec:
            value: {{ .Values.debugEnv | quote }}
          - name: DISPLAY_ACCESS_LOG
            value: {{ .Values.router.displayAccessLog | default false | quote }}
-{{- if .Values.analytics }}
-          - name: ANALYTICS_URL
-            value: "https://g.fission.sh/metrics"
-{{- else if .Values.analyticsNonHelmInstall }}
-          - name: ANALYTICS_URL
-            value: "https://g.fission.sh/metrics"
-{{- end }}
+        resources:
+          {{- toYaml .Values.router.resources | indent 10 }}
        readinessProbe:
          httpGet:
            path: "/router-healthz"
@@ -89,6 +86,10 @@ spec:
        - containerPort: 8888
          name: http
      serviceAccountName: fission-svc
+{{- if .Values.router.extraCoreComponentPodConfig }}
+{{ toYaml .Values.router.extraCoreComponentPodConfig | indent 6 -}}
+{{- else }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+{{- end }}
@@ -41,7 +41,7 @@ spec:
  selector:
    svc: controller

-{{- if .Values.nats.enabled }}
+{{- if and .Values.nats.enabled (not .Values.nats.external) }}
 ---
 apiVersion: v1
 kind: Service
@@ -20,13 +20,7 @@ image: fission/fission-bundle
 pullPolicy: IfNotPresent

 ## Fission image version
-imageTag: 1.7.0
-
-## Fission fetcher repository
-fetcherImage: fission/fetcher
-
-## Fission fetcher image version
-fetcherImageTag: 1.7.0
+imageTag: 1.13.0

 ## Port at which Fission controller service should be exposed
 controllerPort: 31313
@@ -35,6 +29,7 @@ controllerPort: 31313
 routerPort: 31314

 ## Port at which NATS streaming service should be exposed
+## (only if nats enabled and not external)
 natsStreamingPort: 31316

 ## Set to false if you create the namespaces manually
@@ -51,13 +46,30 @@ builderNamespace: fission-builder
 ## Enable istio integration
 enableIstio: false

+fetcher:
+  ## Fetcher repository
+  image: fission/fetcher
+  ## Fetcher image version
+  imageTag: 1.13.0
+
+  ## Fetcher is only for to downloading or uploading archive.
+  ## Normally, you don't need to change the value here, unless necessary.
+  resource:
+    cpu:
+      requests: "10m"
+      ## Low CPU limits will increases the function specialization time.
+      limits: ""
+    mem:
+      requests: "16Mi"
+      limits: ""
+
 ## Logger config
 logger:
  influxdbAdmin: "admin"
  fluentdImageRepository: index.docker.io
  fluentdImage: fluent/fluent-bit
-  fluentdImageTag: 1.0.4
-  
+  fluentdImageTag: 1.5.1
+
  ## Fluent-bit writes/reads it’s own sqlite database to record a history of tracked
  ## files and a state of offsets, this is very useful to resume a state if the ser-
  ## vice is restarted. For Kubernetes environment with constraints like OpenShift,
@@ -65,29 +77,41 @@ logger:
  ## security context and set privileged to true.
  enableSecurityContext: false

+  ## Enable PodSecurityPolicies to allow privileged container
+  ## Only required in some clusters and when enableSecurityContext is true
+  podSecurityPolicy:
+    enabled: false
+
+    ## Configure additional capabilities
+    additionalCapabilities:
+    # example values for linkerd
+    #- NET_RAW
+    #- NET_ADMIN
+
 executor:
  adoptExistingResources: false
+  podReadyTimeout: 300s

 ## Router config
 router:
  deployAsDaemonSet: false
  svcAddressMaxRetries: 5
  svcAddressUpdateTimeout: 30s
-  
+  unTapServiceTimeout: 3600s
  ## Display endpoint access logs
  ## To be aware of enabling logging endpoint access log, it increases
  ## router resource utilization when under heavy workloads.
  displayAccessLog: false
-  
+
  ## Add annotations for router
  # svcAnnotations:
  #   cloud.google.com/load-balancer-type: Internal
-  
+
  ## For router to match encoded path.
  ## If true, "/foo%2Fbar" will match the path "/{var}";
  ## Otherwise, it will match the path "/foo/bar".
  useEncodedPath: false
-  
+
  roundTrip:
    ## If true, router will disable the HTTP keep-alive which result in performance degradation.
    ## But it ensures that router can redirect new coming requests to new function pods.
@@ -116,32 +140,85 @@ router:

  ## Sample with a rate per time window (traces/second)
  traceSamplingRate: 0.5
+  
+  ## Extend the container specs for the core fission pods.
+  ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
+  ## For example:
+  ## extraCoreComponentPodConfig:
+  ##   affinity:
+  ##     nodeAffinity:
+  ##       requiredDuringSchedulingIgnoredDuringExecution:
+  ##         nodeSelectorTerms:
+  ##           - matchExpressions:
+  ##             - key: capability
+  ##               operator: In
+  ##               values:
+  ##                 - app
+  #extraCoreComponentPodConfig:
+  #  affinity:
+  #  tolerations:
+  #  nodeSelector:
+
+  # Pod resources as:
+  #  resources:
+  #    limits:
+  #      cpu: <tbd>
+  #      memory: <tbd>
+  #    requests:
+  #      cpu: <tbd>
+  #      memory: <tbd>
+  resources: {}

 ## Message queue trigger config
 ### NATS Streaming, enabled by default
 nats:
+  # whether or not to use NATS
  enabled: true
+
+  # if true, don't install NATS, but
+  external: false
+
+  # Address of NATS server (domain:port)
+  # change from default for external NATS
+  hostaddress: "nats-streaming:4222"
+
+  # Authorization token to use with NATS
  authToken: "defaultFissionAuthToken"
+
+  # NATS streaming clusterID
  clusterID: "fissionMQTrigger"

+  # Client name registered with NATS streaming
+  clientID: "fission"
+
+  # Queue group registered with NATS streaming
+  queueGroup: "fission-messageQueueNatsTrigger"
+
+  # The image to use for NATS streaming server
+  streamingserver:
+    image: nats-streaming
+
 ## Azure-storage-queue: enable and configure the details
 azureStorageQueue:
  enabled: false
  key: ""
  accountName: ""
-  
+
 ## Kafka: enable and configure the details
 kafka:
  enabled: false
-  # note: below link is only for reference. 
-  # Please use the brokers link for your kafka here. 
-  brokers: 'broker.kafka:9092' # or your-bootstrap-server.kafka:9092/9093
+  # note: below link is only for reference.
+  # Please use the brokers link for your kafka here.
+  brokers: "broker.kafka:9092" # or your-bootstrap-server.kafka:9092/9093
  authentication:
    tls:
      enabled: false
-      caCert: '' # path to certificate containing public key of CA authority
-      userCert: '' # path to certificate containing public key of the user signed by CA authority
-      userKey: '' # path to private key of the user
+      # InsecureSkipVerify controls whether a client verifies the server's certificate chain and host name.
+      insecureSkipVerify: false # Warning: Setting this to true, makes TLS susceptible to man-in-the-middle attacks
+      caCert: "" # path to certificate containing public key of CA authority
+      userCert: "" # path to certificate containing public key of the user signed by CA authority
+      userKey: "" # path to private key of the user
+

  # brokers: 'my-broker.kafka:9092' # or my-bootstrap-server.kafka:9092/9093
  # Sample config for authentication
@@ -162,11 +239,23 @@ kafka:

 ## Persist data to a persistent volume.
 persistence:
-  ## If true, fission will create/use a Persistent Volume Claim
+  ## If true, fission will create/use a Persistent Volume Claim unless storageType is set to s3
  ## If false, use emptyDir
  ##
  enabled: true

+  ## Must be set to either local or S3.
+  ## If storateType is set(other than local), one of its backend configuration must be set as below.
+  #storageType: local | s3
+
+  ## Sample configruation for AWS s3 storage backend
+  #s3:
+  # bucketName: <awsBucketName>
+  # subDir: <sub directory within a bucket>
+  # accessKeyId: <awsAccessKeyId>
+  # secretAccessKey: <awsSecretAccessKey>
+  # region: <awsRegion>
+
  ## A manually managed Persistent Volume Claim name
  ## Requires persistence.enabled: true
  ## If defined, PVC must be created manually before volume will be bound
@@ -184,7 +273,7 @@ persistence:
  accessMode: ReadWriteOnce
  size: 8Gi

-## Extend the container specs for the core fission pods. 
+## Extend the container specs for the core fission pods.
 ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
 ## For example:
 ## extraCoreComponentPodConfig:
@@ -209,9 +298,20 @@ analytics: true
 ## Internally used for generating an analytics job for non-helm installs
 analyticsNonHelmInstall: false

+## Google Analytics Tracking ID
+gaTrackingID: UA-196546703-1
+
 ## Enable Heapster only in clusters where heapster does not exist already
 heapster: false

+## Enable InfluxDB
+influxdb:
+  enabled: true
+  image: influxdb:1.7
+
+# Allow user to override busybox image used in fluent-bit init container
+busyboxImage: busybox
+
 ## Archive pruner is a garbage collector for archives on the fission storage service.
 ## This interval configures the frequency at which it runs inside the storagesvc pod.
 ## The value is in minutes.
@@ -220,6 +320,9 @@ pruneInterval: 60
 ## Fission pre-install/pre-upgrade checks live in this image
 preUpgradeChecksImage: fission/pre-upgrade-checks

+## Fission ppost-install/post-upgrade reporting live in this image
+postInstallReportImage: fission/reporter
+
 ## if there are any pod specialization errors when a function is triggered and this flag is set to true, the error
 ## summary is returned as part of http response
 debugEnv: false
@@ -228,7 +331,7 @@ debugEnv: false
 prometheus:
  ## set this flag to true if prometheus needs to be deployed along with fission
  enabled: true
-  
+
  ## If enabled is false, please assign the prometheus service URL
  ## that is accessible by components.
  serviceEndpoint: ""
@@ -240,3 +343,26 @@ canaryDeployment:
 # Use these flags to enable opentracing, the variable is endpoint of Jaeger collector in the format shown below
 #traceCollectorEndpoint: "http://jaeger-collector.jaeger.svc:14268/api/traces?format=jaeger.thrift"
 #traceSamplingRate: 0.75
+
+## Message Queue Trigger Kind, KEDA: enable and configuration
+mqt_keda:
+  enabled: true
+  connector_images:
+    kafka:
+      image: fission/keda-kafka-http-connector
+      tag: v0.6
+    rabbitmq:
+      image: fission/keda-rabbitmq-http-connector
+      tag: v0.6
+    awskinesis:
+      image: fission/keda-aws-kinesis-http-connector
+      tag: v0.6
+    aws_sqs:
+      image: fission/keda-aws-sqs-http-connector
+      tag: v0.6
+    nats_steaming:
+      image: fission/keda-nats-streaming-http-connector
+      tag: v0.6
+    gcp_pub_sub:
+      image: fission/keda-gcp-pubsub-http-connector
+      tag: v0.1
@@ -0,0 +1,6 @@
+dependencies:
+- name: prometheus
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 13.2.1
+digest: sha256:136360a97bdc11f1933d75bab77728acc75dd9583257b973cb3336b6d136c9b6
+generated: "2021-05-31T21:04:26.076006+05:30"
@@ -1,15 +1,21 @@
-apiVersion: v1
+apiVersion: v2
 name: fission-core
-version: 1.7.0
+version: 1.13.0
 description: Fission is a fast serverless framework for Kubernetes.
 keywords:
 - fission
 - serverless
-home: http://fission.io/
+home: https://fission.io/
 maintainers:
-  - name: Soam Vasani
-    email: soamvasani+1@gmail.com
-  - name: Ta Ching Chen
-    email: hello@tachingchen.com
+  - name: Vishal Biyani
+    email: vishal@infracloud.io
+  - name: Sanket Sudake
+    email: sanket@infracloud.io
 engine: gotpl
-appVersion: 1.7.0
+appVersion: 1.13.0
+type: application
+dependencies:
+  - name: prometheus
+    version: 13.2.1
+    repository: https://prometheus-community.github.io/helm-charts
+    condition: prometheus.enabled
@@ -1,6 +0,0 @@
-dependencies:
- name: prometheus
-  repository: https://kubernetes-charts.storage.googleapis.com
-  version: 9.3.1
-digest: sha256:89a63a5f01c08032106a94c59fc7a5929e449458bf5fd06d86c8b048ac628bf4
-generated: "2019-11-18T10:16:25.945208326Z"
@@ -1,5 +0,0 @@
-dependencies:
-  - name: prometheus
-    version: 9.3.1
-    repository: https://kubernetes-charts.storage.googleapis.com
-    condition: prometheus.enabled
@@ -1,13 +1,13 @@
 1. Install the client CLI.

 Mac:
-  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-cli-osx && chmod +x fission && sudo mv fission /usr/local/bin/
+  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-{{ .Chart.Version }}-darwin-amd64 && chmod +x fission && sudo mv fission /usr/local/bin/

 Linux:
-  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-cli-linux && chmod +x fission && sudo mv fission /usr/local/bin/
+  $ curl -Lo fission https://github.com/fission/fission/releases/download/{{ .Chart.Version }}/fission-{{ .Chart.Version }}-linux-amd64 && 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/{{ .Chart.Version }}/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/{{ .Chart.Version }}/fission-{{ .Chart.Version }}-windows-amd64.exe

 2. You're ready to use Fission!

@@ -15,7 +15,7 @@ Windows:
  $ fission env create --name nodejs --image fission/node-env

  # Get a hello world
-  $ curl https://raw.githubusercontent.com/fission/fission/master/examples/nodejs/hello.js > hello.js
+  $ curl https://raw.githubusercontent.com/fission/examples/master/nodejs/hello.js > hello.js

  # Register this function with Fission
  $ fission function create --name hello --env nodejs --code hello.js
@@ -210,7 +210,9 @@ spec:
        args: ["--executorPort", "8888", "--namespace", "{{ .Values.functionNamespace }}"]
        env:
        - name: FETCHER_IMAGE
-          value: "{{ .Values.fetcherImage }}:{{ .Values.fetcherImageTag }}"
+          value: "{{ .Values.fetcher.image }}:{{ .Values.fetcher.imageTag }}"
+        - name: RUNTIME_IMAGE_PULL_POLICY
+          value: "{{ .Values.pullPolicy }}"
        - name: FETCHER_IMAGE_PULL_POLICY
          value: "{{ .Values.pullPolicy }}"
        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
@@ -219,16 +221,18 @@ spec:
          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
        - name: ADOPT_EXISTING_RESOURCES
          value: {{ .Values.executor.adoptExistingResources | default false | quote }}
+        - name: POD_READY_TIMEOUT
+          value: {{ .Values.executor.podReadyTimeout | default false | quote }}
        - name: ENABLE_ISTIO
          value: "{{ .Values.enableIstio }}"
        - name: FETCHER_MINCPU
-          value: {{ .Values.fetcherMinCpu | default "10m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.requests | quote }}
        - name: FETCHER_MINMEM
-          value: {{ .Values.fetcherMinMem | default "16Mi" | quote }}
+          value: {{ .Values.fetcher.resource.mem.requests | quote }}
        - name: FETCHER_MAXCPU
-          value: {{ .Values.fetcherMaxCpu | default "1000m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.limits | quote }}
        - name: FETCHER_MAXMEM
-          value: {{ .Values.fetcherMaxMem | default "128Mi" | quote }}          
+          value: {{ .Values.fetcher.resource.mem.limits | quote }}
        readinessProbe:
          httpGet:
            path: "/healthz"
@@ -278,7 +282,7 @@ spec:
        args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
        env:
        - name: FETCHER_IMAGE
-          value: "{{ .Values.fetcherImage }}:{{ .Values.fetcherImageTag }}"
+          value: "{{ .Values.fetcher.image }}:{{ .Values.fetcher.imageTag }}"
        - name: FETCHER_IMAGE_PULL_POLICY
          value: "{{ .Values.pullPolicy }}"
        - name: BUILDER_IMAGE_PULL_POLICY
@@ -286,17 +290,17 @@ spec:
        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
          value: "{{ .Values.traceCollectorEndpoint }}"
        - name: TRACING_SAMPLING_RATE
-          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}          
+          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}      
        - name: ENABLE_ISTIO
          value: "{{ .Values.enableIstio }}"
        - name: FETCHER_MINCPU
-          value: {{ .Values.fetcherMinCpu | default "10m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.requests | quote }}
        - name: FETCHER_MINMEM
-          value: {{ .Values.fetcherMinMem | default "16Mi" | quote }}
+          value: {{ .Values.fetcher.resource.mem.requests | quote }}
        - name: FETCHER_MAXCPU
-          value: {{ .Values.fetcherMaxCpu | default "1000m" | quote }}
+          value: {{ .Values.fetcher.resource.cpu.limits | quote }}
        - name: FETCHER_MAXMEM
-          value: {{ .Values.fetcherMaxMem | default "128Mi" | quote }}          
+          value: {{ .Values.fetcher.resource.mem.limits | quote }}
      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
@@ -396,29 +400,134 @@ spec:
        image: {{ include "fission-bundleImage" . | quote }}
        imagePullPolicy: {{ .Values.pullPolicy }}
        command: ["/fission-bundle"]
-        args: ["--storageServicePort", "8000", "--filePath", "/fission"]
+        {{- if and (.Values.persistence.enabled) (eq (.Values.persistence.storageType | default "local") "s3") }}
+        args: ["--storageServicePort", "8000", "--storageType", "s3"]
+        {{- else }}
+        args: ["--storageServicePort", "8000", "--storageType", "local"]
+        {{- end }}
        env:
        - name: PRUNE_INTERVAL
          value: "{{.Values.pruneInterval}}"
        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
          value: "{{ .Values.traceCollectorEndpoint }}"
        - name: TRACING_SAMPLING_RATE
-          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}          
+          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
+        {{- if and (.Values.persistence.enabled) (eq (.Values.persistence.storageType | default "local") "s3") }}
+        - name: STORAGE_S3_ENDPOINT
+          value: {{ .Values.persistence.s3.endPoint }}
+        - name: STORAGE_S3_BUCKET_NAME
+          value: {{ .Values.persistence.s3.bucketName }}
+        - name: STORAGE_S3_SUB_DIR
+          value: {{ .Values.persistence.s3.subDir }}
+        - name: STORAGE_S3_ACCESS_KEY_ID
+          value: {{ .Values.persistence.s3.accessKeyId }}
+        - name: STORAGE_S3_SECRET_ACCESS_KEY
+          value: {{ .Values.persistence.s3.secretAccessKey }}
+        - name: STORAGE_S3_REGION
+          value: {{ .Values.persistence.s3.region }}
+        {{- end }}
+        {{- if ne (.Values.persistence.storageType | default "local") "s3" }}
        volumeMounts:
        - name: fission-storage
          mountPath: /fission
+        {{- end }}
        ports:
          - containerPort: 8000
            name: http
      serviceAccountName: fission-svc
+      {{- if and (.Values.persistence.enabled) (ne (.Values.persistence.storageType | default "local") "s3") }}
      volumes:
      - name: fission-storage
-      {{- if .Values.persistence.enabled }}   
        persistentVolumeClaim:
          claimName: {{ .Values.persistence.existingClaim | default "fission-storage-pvc" }}
      {{- else }}
+      volumes:
+      - name: fission-storage
        emptyDir: {}
      {{- end }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+
+{{- if .Values.mqt_keda.enabled }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mqtrigger-keda
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    svc: mqtrigger-keda
+    messagequeue: keda
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      svc: mqtrigger-keda
+      messagequeue: keda
+  template:
+    metadata:
+      labels:
+        svc: mqtrigger-keda
+        messagequeue: keda
+    spec:
+      containers:
+      - name:  mqtrigger-keda
+        image: {{ include "fission-bundleImage" . | quote }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        command: ["/fission-bundle"]
+        args: ["--mqt_keda", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
+        env:
+        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
+          value: "{{ .Values.traceCollectorEndpoint }}"
+        - name: TRACING_SAMPLING_RATE
+          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
+        - name: DEBUG_ENV
+          value: {{ .Values.debugEnv | quote }}
+        - name: CONNECTOR_IMAGE_PULL_POLICY
+          value: "{{ .Values.pullPolicy }}"
+        - name: KAFKA_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.kafka.image }}:{{ .Values.mqt_keda.connector_images.kafka.tag }}"
+        - name: RABBITMQ_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.rabbitmq.image }}:{{ .Values.mqt_keda.connector_images.rabbitmq.tag }}"
+        - name: AWS-KINESIS-STREAM_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.awskinesis.image }}:{{ .Values.mqt_keda.connector_images.awskinesis.tag }}"
+        - name: AWS-SQS-QUEUE_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.aws_sqs.image }}:{{ .Values.mqt_keda.connector_images.aws_sqs.tag }}"
+        - name: STAN_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.nats_steaming.image }}:{{ .Values.mqt_keda.connector_images.nats_steaming.tag }}"
+        - name: GCP-PUB-SUB_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.gcp_pub_sub.image }}:{{ .Values.mqt_keda.connector_images.gcp_pub_sub.tag }}"
+      serviceAccountName: fission-svc
+{{- if .Values.extraCoreComponentPodConfig }}
+{{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
+{{- end }}
+{{- end }}
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ .Values.functionNamespace }}
+  name: event-fetcher
+rules:
+- apiGroups: [""] # "" indicates the core API group
+  resources: ["pods"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: [""] # "" indicates the core API group
+  resources: ["events"]
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: fission-fetcher-pod-reader
+  namespace: {{ .Values.functionNamespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: event-fetcher
+subjects:
+- kind: ServiceAccount
+  name: fission-fetcher
+  namespace: {{ .Values.functionNamespace }}
@@ -26,6 +26,16 @@ spec:
      restartPolicy: Never
      containers:
        - name: post-install-job
-          image: "fission/alpinecurl"
-          command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"yaml-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"]
+        {{- if .Values.imageTag }}
+          image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+        {{- else }}
+          image: {{ .Values.postInstallReportImage }}
+        {{- end }}
+          imagePullPolicy: {{ .Values.pullPolicy }}
+          command: [ "/reporter" ]
+          args: ["event", "-c", "fission-use", "-a", "yaml-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
+          env:
+            - name: GA_TRACKING_ID
+              value: "{{ .Values.gaTrackingID }}"
+      serviceAccountName: fission-svc
 {{- end }}
@@ -30,6 +30,16 @@ spec:
      restartPolicy: Never
      containers:
        - name: post-install-job
-          image: "fission/alpinecurl"
-          command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"]
+        {{- if .Values.imageTag }}
+          image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+        {{- else }}
+          image: {{ .Values.postInstallReportImage }}
+        {{- end }}
+          imagePullPolicy: {{ .Values.pullPolicy }}
+          command: [ "/reporter" ]
+          args: ["event", "-c", "fission-use", "-a", "helm-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
+          env:
+            - name: GA_TRACKING_ID
+              value: "{{ .Values.gaTrackingID }}"
+      serviceAccountName: fission-svc
 {{- end }}
@@ -30,6 +30,16 @@ spec:
      restartPolicy: Never
      containers:
        - name: post-upgrade-job
-          image: "fission/alpinecurl"
-          command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-upgrade\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"]
+        {{- if .Values.imageTag }}
+          image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+        {{- else }}
+          image: {{ .Values.postInstallReportImage }}
+        {{- end }}
+          imagePullPolicy: {{ .Values.pullPolicy }}
+          command: [ "/reporter" ]
+          args: ["event", "-c", "fission-use", "-a", "helm-post-upgrade", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
+          env:
+            - name: GA_TRACKING_ID
+              value: "{{ .Values.gaTrackingID }}"
+      serviceAccountName: fission-svc
 {{- end }}
@@ -1,4 +1,4 @@
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+{{- if and (.Values.persistence.enabled) (not .Values.persistence.existingClaim) (eq (.Values.persistence.storageType | default "local") "local") }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -53,6 +53,8 @@ spec:
            value: {{ .Values.router.svcAddressMaxRetries | default 5 | quote }}
          - name: ROUTER_SVC_ADDRESS_UPDATE_TIMEOUT
            value: {{ .Values.router.svcAddressUpdateTimeout | default "30s" | quote }}
+          - name: ROUTER_UNTAP_SERVICE_TIMEOUT
+            value: {{ .Values.router.unTapServiceTimeout | default "3600s" | quote }}
          - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
            value: "{{ .Values.traceCollectorEndpoint }}"
          - name: TRACING_SAMPLING_RATE
@@ -63,13 +65,8 @@ spec:
            value: {{ .Values.debugEnv | quote }}
          - name: DISPLAY_ACCESS_LOG
            value: {{ .Values.router.displayAccessLog | default false | quote }}
-{{- if .Values.analytics }}
-          - name: ANALYTICS_URL
-            value: "https://g.fission.sh/metrics"
-{{- else if .Values.analyticsNonHelmInstall }}
-          - name: ANALYTICS_URL
-            value: "https://g.fission.sh/metrics"
-{{- end }}
+        resources:
+          {{- toYaml .Values.router.resources | indent 10 }}
        readinessProbe:
          httpGet:
            path: "/router-healthz"
@@ -89,6 +86,10 @@ spec:
        - containerPort: 8888
          name: http
      serviceAccountName: fission-svc
+{{- if .Values.router.extraCoreComponentPodConfig }}
+{{ toYaml .Values.router.extraCoreComponentPodConfig | indent 6 -}}
+{{- else }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+{{- end }}
@@ -17,17 +17,11 @@ repository: index.docker.io
 image: fission/fission-bundle

 ## Fission image version
-imageTag: 1.7.0
+imageTag: 1.13.0

 ## Image pull policy
 pullPolicy: IfNotPresent

-## Fission fetcher repository
-fetcherImage: fission/fetcher
-
-## Fission fetcher image version
-fetcherImageTag: 1.7.0
-
 ## Port at which Fission controller service should be exposed
 controllerPort: 31313

@@ -45,29 +39,47 @@ builderNamespace: fission-builder
 ## Enable istio integration
 enableIstio: false

+fetcher:
+  ## Fetcher repository
+  image: fission/fetcher
+  ## Fetcher image version
+  imageTag: 1.13.0
+
+  ## Fetcher is only for to downloading or uploading archive.
+  ## Normally, you don't need to change the value here, unless necessary.
+  resource:
+    cpu:
+      requests: "10m"
+      ## Low CPU limits will increases the function specialization time.
+      limits: ""
+    mem:
+      requests: "16Mi"
+      limits: ""
+
 executor:
  adoptExistingResources: false
+  podReadyTimeout: 300s

 ## Router config
 router:
  deployAsDaemonSet: false
  svcAddressMaxRetries: 5
  svcAddressUpdateTimeout: 30s
-  
+  unTapServiceTimeout: 3600s
  ## Display endpoint access logs
  ## To be aware of enabling logging endpoint access log, it increases
  ## router resource utilization when under heavy workloads.
  displayAccessLog: false
-  
+
  ## Add annotations for router
  # svcAnnotations:
  #   cloud.google.com/load-balancer-type: Internal
-  
+
  ## For router to match encoded path.
  ## If true, "/foo%2Fbar" will match the path "/{var}";
  ## Otherwise, it will match the path "/foo/bar".
  useEncodedPath: false
-  
+
  roundTrip:
    ## If true, router will disable the HTTP keep-alive which result in performance degradation.
    ## But it ensures that router can redirect new coming requests to new function pods.
@@ -96,14 +108,54 @@ router:

  ## Sample with a rate per time window (traces/second)
  traceSamplingRate: 0.5
+  
+  ## Extend the container specs for the router fission pods.
+  ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
+  ## For example:
+  ## extraCoreComponentPodConfig:
+  ##   affinity:
+  ##     nodeAffinity:
+  ##       requiredDuringSchedulingIgnoredDuringExecution:
+  ##         nodeSelectorTerms:
+  ##           - matchExpressions:
+  ##             - key: capability
+  ##               operator: In
+  ##               values:
+  ##                 - app
+  #extraCoreComponentPodConfig:
+  #  affinity:
+  #  tolerations:
+  #  nodeSelector:
+
+  # Pod resources as:
+  #  resources:
+  #    limits:
+  #      cpu: <tbd>
+  #      memory: <tbd>
+  #    requests:
+  #      cpu: <tbd>
+  #      memory: <tbd>
+  resources: {}

 ## Persist data to a persistent volume.
 persistence:
-  ## If true, fission will create/use a Persistent Volume Claim
+  ## If true, fission will create/use a Persistent Volume Claim unless storageType is set to s3
  ## If false, use emptyDir
  ##
  enabled: true

+  ## Must be set to either local or S3.
+  ## If storateType is set(other than local), one of its backend configuration must be set as below.
+  #storageType: local | s3
+
+  ## Sample configruation for AWS s3 storage backend
+  #s3:
+  # bucketName: <awsBucketName>
+  # subDir: <sub directory within a bucket>
+  # accessKeyId: <awsAccessKeyId>
+  # secretAccessKey: <awsSecretAccessKey>
+  # region: <awsRegion>
+
  ## A manually managed Persistent Volume Claim name
  ## Requires persistence.enabled: true
  ## If defined, PVC must be created manually before volume will be bound
@@ -121,7 +173,7 @@ persistence:
  accessMode: ReadWriteOnce
  size: 8Gi

-## Extend the container specs for the core fission pods. 
+## Extend the container specs for the core fission pods.
 ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
 ## For example:
 ## extraCoreComponentPodConfig:
@@ -146,6 +198,9 @@ analytics: true
 ## Internally used for generating an analytics job for non-helm installs
 analyticsNonHelmInstall: false

+## Google Analytics Tracking ID
+gaTrackingID: UA-196546703-1
+
 ## Archive pruner is a garbage collector for archives on the fission storage service.
 ## This interval configures the frequency at which it runs inside the storagesvc pod.
 ## The value is in minutes.
@@ -154,6 +209,9 @@ pruneInterval: 60
 ## Fission pre-install/pre-upgrade checks live in this image
 preUpgradeChecksImage: fission/pre-upgrade-checks

+## Fission ppost-install/post-upgrade reporting live in this image
+postInstallReportImage: fission/reporter
+
 ## if there are any pod specialization errors when a function is triggered and this flag is set to true, the error
 ## summary is returned as part of http response
 debugEnv: false
@@ -161,8 +219,8 @@ debugEnv: false
 ## Prometheus for scrapping service metrics
 prometheus:
  ## set this flag to true if prometheus needs to be deployed along with fission
-  enabled: true
-  
+  enabled: false
+
  ## If enabled is false, please assign the prometheus service URL
  ## that is accessible by components.
  serviceEndpoint: ""
@@ -174,3 +232,26 @@ canaryDeployment:
 # Use these flags to enable opentracing, the variable is endpoint of Jaeger collector in the format shown below
 #traceCollectorEndpoint: "http://jaeger-collector.jaeger.svc:14268/api/traces?format=jaeger.thrift"
 #traceSamplingRate: 0.75
+
+## Message Queue Trigger Kind, KEDA: enable and configuration
+mqt_keda:
+  enabled: true
+  connector_images:
+    kafka:
+      image: fission/keda-kafka-http-connector
+      tag: v0.6
+    rabbitmq:
+      image: fission/keda-rabbitmq-http-connector
+      tag: v0.6
+    awskinesis:
+      image: fission/keda-aws-kinesis-http-connector
+      tag: v0.6
+    aws_sqs:
+      image: fission/keda-aws-sqs-http-connector
+      tag: v0.6
+    nats_steaming:
+      image: fission/keda-nats-streaming-http-connector
+      tag: v0.6
+    gcp_pub_sub:
+      image: fission/keda-gcp-pubsub-http-connector
+      tag: v0.1
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine as godep
+FROM golang:1.15-alpine as godep
 RUN apk add bash ca-certificates git gcc g++ libc-dev

 ARG GOPKG=github.com/fission/fission
@@ -12,7 +12,7 @@ COPY go.* ./

 RUN go mod download

-From godep as builder
+FROM godep as builder

 ARG GOPKG
 WORKDIR /go/src/${GOPKG}
@@ -31,13 +31,13 @@ ARG BUILDVERSION=unknown
 ARG BUILDDATE=unknown
 # E.g. BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')

-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
+RUN CGO_ENABLED=0 go build \
    -o /go/bin/builder \
    -gcflags=-trimpath=$GOPATH \
    -asmflags=-trimpath=$GOPATH \
    -ldflags "-X github.com/fission/fission/pkg/info.GitCommit=${GITCOMMIT} -X github.com/fission/fission/pkg/info.BuildDate=${BUILDDATE} -X github.com/fission/fission/pkg/info.Version=${BUILDVERSION}"

-FROM alpine:3.10 as base
+FROM alpine:3.13 as base
 RUN apk add --update ca-certificates
 COPY --from=builder /go/bin/builder /
 EXPOSE 8001
@@ -21,17 +21,25 @@ import (
 	"os"

 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"

 	"github.com/fission/fission/cmd/builder/app"
 )

 // Usage: builder <shared volume path>
 func main() {
-	logger, err := zap.NewProduction()
+	config := zap.NewProductionConfig()
+	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	logger, err := config.Build()
 	if err != nil {
 		log.Fatalf("can't initialize zap logger: %v", err)
 	}
-	defer logger.Sync()
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()

 	shareVolume := os.Args[1]
 	if _, err := os.Stat(shareVolume); err != nil {
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine as godep
+FROM golang:1.15-alpine as godep
 RUN apk add bash ca-certificates git gcc g++ libc-dev

 ARG GOPKG=github.com/fission/fission
@@ -12,7 +12,7 @@ COPY go.* ./

 RUN go mod download

-From godep as builder
+FROM godep as builder

 ARG GOPKG
 WORKDIR /go/src/${GOPKG}
@@ -31,13 +31,13 @@ ARG BUILDVERSION=unknown
 ARG BUILDDATE=unknown
 # E.g. BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')

-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
+RUN CGO_ENABLED=0 go build \
    -o /go/bin/fetcher \
    -gcflags=-trimpath=$GOPATH \
    -asmflags=-trimpath=$GOPATH \
    -ldflags "-X github.com/fission/fission/pkg/info.GitCommit=${GITCOMMIT} -X github.com/fission/fission/pkg/info.BuildDate=${BUILDDATE} -X github.com/fission/fission/pkg/info.Version=${BUILDVERSION}"

-FROM alpine:3.10 as base
+FROM alpine:3.13 as base
 RUN apk add --update ca-certificates
 COPY --from=builder /go/bin/fetcher /
 EXPOSE 8000
@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"log"
 	"net/http"
 	"os"

@@ -30,7 +31,6 @@ import (
 	"go.uber.org/zap"

 	"github.com/fission/fission/pkg/fetcher"
-	"github.com/fission/fission/pkg/types"
 )

 func registerTraceExporter(collectorEndpoint string) error {
@@ -94,7 +94,7 @@ func Run(logger *zap.Logger) {
 	// do specialization in other goroutine to prevent blocking in newdeploy
 	go func() {
 		if *specializeOnStart {
-			var specializeReq types.FunctionSpecializeRequest
+			var specializeReq fetcher.FunctionSpecializeRequest

 			err := json.Unmarshal([]byte(*specializePayload), &specializeReq)
 			if err != nil {
@@ -116,6 +116,8 @@ func Run(logger *zap.Logger) {
 	mux.HandleFunc("/specialize", f.SpecializeHandler)
 	mux.HandleFunc("/upload", f.UploadHandler)
 	mux.HandleFunc("/version", f.VersionHandler)
+	mux.HandleFunc("/wsevent/start", f.WsStartHandler)
+	mux.HandleFunc("/wsevent/end", f.WsEndHandler)

 	readinessHandler := func(w http.ResponseWriter, r *http.Request) {
 		if !*specializeOnStart || readyToServe {
@@ -135,9 +137,12 @@ func Run(logger *zap.Logger) {
 	mux.HandleFunc("/readniess-healthz", readinessHandler)

 	logger.Info("fetcher ready to receive requests")
-	http.ListenAndServe(":8000", &ochttp.Handler{
+	err = http.ListenAndServe(":8000", &ochttp.Handler{
 		Handler: mux,
 	})
+	if err != nil {
+		log.Fatal(err)
+	}
 }

 func fetcherUsage() {
@@ -20,17 +20,24 @@ import (
 	"log"

 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"

 	"github.com/fission/fission/cmd/fetcher/app"
 )

 // Usage: fetcher <shared volume path>
 func main() {
-	logger, err := zap.NewProduction()
+	config := zap.NewProductionConfig()
+	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	logger, err := config.Build()
 	if err != nil {
 		log.Fatalf("can't initialize zap logger: %v", err)
 	}
-	defer logger.Sync()
-
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 	app.Run(logger)
 }
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine as godep
+FROM golang:1.15-alpine as godep
 RUN apk add bash ca-certificates git gcc g++ libc-dev

 ARG GOPKG=github.com/fission/fission
@@ -12,7 +12,7 @@ COPY go.* ./

 RUN go mod download

-From godep as builder
+FROM godep as builder

 ARG GOPKG
 WORKDIR /go/src/${GOPKG}
@@ -31,13 +31,13 @@ ARG BUILDVERSION=unknown
 ARG BUILDDATE=unknown
 # E.g. BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')

-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
+RUN CGO_ENABLED=0 go build \
    -o /go/bin/fission-bundle \
    -gcflags=-trimpath=$GOPATH \
    -asmflags=-trimpath=$GOPATH \
    -ldflags "-X github.com/fission/fission/pkg/info.GitCommit=${GITCOMMIT} -X github.com/fission/fission/pkg/info.BuildDate=${BUILDDATE} -X github.com/fission/fission/pkg/info.Version=${BUILDVERSION}"

-FROM alpine:3.10 as base
+FROM alpine:3.13 as base
 RUN apk add --update ca-certificates
 COPY --from=builder /go/bin/fission-bundle /

@@ -27,14 +27,16 @@ import (
 	docopt "github.com/docopt/docopt-go"
 	"go.opencensus.io/trace"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"

+	"github.com/fission/fission/cmd/fission-bundle/mqtrigger"
 	"github.com/fission/fission/pkg/buildermgr"
 	"github.com/fission/fission/pkg/controller"
 	"github.com/fission/fission/pkg/executor"
 	"github.com/fission/fission/pkg/info"
 	"github.com/fission/fission/pkg/kubewatcher"
 	functionLogger "github.com/fission/fission/pkg/logger"
-	messagequeue "github.com/fission/fission/pkg/mqtrigger"
+	mqt "github.com/fission/fission/pkg/mqtrigger"
 	"github.com/fission/fission/pkg/router"
 	"github.com/fission/fission/pkg/storagesvc"
 	"github.com/fission/fission/pkg/timer"
@@ -72,20 +74,25 @@ func runTimer(logger *zap.Logger, routerUrl string) {
 }

 func runMessageQueueMgr(logger *zap.Logger, routerUrl string) {
-	err := messagequeue.Start(logger, routerUrl)
+	err := mqtrigger.Start(logger, routerUrl)
 	if err != nil {
 		logger.Fatal("error starting message queue manager", zap.Error(err))
 	}
 }

-func runStorageSvc(logger *zap.Logger, port int, filePath string) {
-	subdir := os.Getenv("SUBDIR")
-	if len(subdir) == 0 {
-		subdir = "fission-functions"
+// KEDA based MessageQueue Trigger Manager
+func runMQManager(logger *zap.Logger, routerURL string) {
+	err := mqt.StartScalerManager(logger, routerURL)
+	if err != nil {
+		logger.Fatal("error starting mqt scaler manager", zap.Error(err))
+	}
+}
+
+func runStorageSvc(logger *zap.Logger, port int, storage storagesvc.Storage) {
+	err := storagesvc.Start(logger, storage, port)
+	if err != nil {
+		logger.Fatal("error starting storage service", zap.Error(err))
 	}
-	enableArchivePruner := true
-	storagesvc.RunStorageService(logger, storagesvc.StorageTypeLocal,
-		filePath, subdir, port, enableArchivePruner)
 }

 func runBuilderMgr(logger *zap.Logger, storageSvcUrl string, envBuilderNamespace string) {
@@ -142,6 +149,8 @@ func registerTraceExporter(logger *zap.Logger, arguments map[string]interface{})
 		serviceName = "Fission-BuilderMgr"
 	} else if arguments["--storageServicePort"] != nil {
 		serviceName = "Fission-StorageSvc"
+	} else if arguments["--mqt_keda"] == true {
+		serviceName = "Fission-Keda-MQTrigger"
 	}

 	exporter, err := jaeger.NewExporter(jaeger.Options{
@@ -167,12 +176,15 @@ func registerTraceExporter(logger *zap.Logger, arguments map[string]interface{})
 }

 func main() {
+	var err error
+
 	// From https://github.com/containous/traefik/pull/1817/files
 	// Tell glog to log into STDERR. Otherwise, we risk
 	// certain kinds of API errors getting logged into a directory not
 	// available in a `FROM scratch` Docker container, causing glog to abort
 	// hard with an exit code > 0.
-	flag.Set("logtostderr", "true")
+	// TODO: fix the lint error. Error checking here is causing all components to crash with error "logtostderr not found"
+	flag.Set("logtostderr", "true") //nolint: errcheck

 	usage := `fission-bundle: Package of all fission microservices: controller, router, executor.

@@ -200,10 +212,11 @@ Usage:
  fission-bundle --routerPort=<port> [--executorUrl=<url>]
  fission-bundle --executorPort=<port> [--namespace=<namespace>] [--fission-namespace=<namespace>]
  fission-bundle --kubewatcher [--routerUrl=<url>]
-  fission-bundle --storageServicePort=<port> --filePath=<filePath>
+  fission-bundle --storageServicePort=<port> --storageType=<storateType>
  fission-bundle --builderMgr [--storageSvcUrl=<url>] [--envbuilder-namespace=<namespace>]
  fission-bundle --timer [--routerUrl=<url>]
  fission-bundle --mqt   [--routerUrl=<url>]
+  fission-bundle --mqt_keda [--routerUrl=<url>]
  fission-bundle --logger
  fission-bundle --version
 Options:
@@ -220,28 +233,36 @@ Options:
  --kubewatcher                   Start Kubernetes events watcher.
  --timer                         Start Timer.
  --mqt                           Start message queue trigger.
+  --mqt_keda					  Start message queue trigger of kind KEDA
  --builderMgr                    Start builder manager.
  --version                       Print version information
 `

 	var logger *zap.Logger
-	var err error
+	var config zap.Config

 	isDebugEnv, _ := strconv.ParseBool(os.Getenv("DEBUG_ENV"))
 	if isDebugEnv {
-		logger, err = zap.NewDevelopment()
-	} else {
-		config := zap.NewProductionConfig()
+		config = zap.NewDevelopmentConfig()
 		config.DisableStacktrace = true
-		logger, err = config.Build()
+		config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	} else {
+		config = zap.NewProductionConfig()
+		config.DisableStacktrace = true
+		config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 	}
+	logger, err = config.Build()
 	if err != nil {
-		log.Fatalf("can't initialize zap logger: %v", err)
+		log.Fatalf("I can't initialize zap logger: %v", err)
 	}
-	defer logger.Sync()
-
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 	version := fmt.Sprintf("Fission Bundle Version: %v", info.BuildInfo().String())
-	arguments, err := docopt.Parse(usage, nil, true, version, false)
+	arguments, err := docopt.ParseArgs(usage, nil, version)
 	if err != nil {
 		logger.Fatal("Could not parse command line arguments", zap.Error(err))
 	}
@@ -285,6 +306,10 @@ Options:
 		runMessageQueueMgr(logger, routerUrl)
 	}

+	if arguments["--mqt_keda"] == true {
+		runMQManager(logger, routerUrl)
+	}
+
 	if arguments["--builderMgr"] == true {
 		runBuilderMgr(logger, storageSvcUrl, envBuilderNs)
 	}
@@ -295,8 +320,15 @@ Options:

 	if arguments["--storageServicePort"] != nil {
 		port := getPort(logger, arguments["--storageServicePort"])
-		filePath := arguments["--filePath"].(string)
-		runStorageSvc(logger, port, filePath)
+
+		var storage storagesvc.Storage
+
+		if arguments["--storageType"] != nil && arguments["--storageType"] == string(storagesvc.StorageTypeS3) {
+			storage = storagesvc.NewS3Storage()
+		} else if arguments["--storageType"] == string(storagesvc.StorageTypeLocal) {
+			storage = storagesvc.NewLocalStorage("/fission")
+		}
+		runStorageSvc(logger, port, storage)
 	}

 	select {}
@@ -26,12 +26,18 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"

+	fv1 "github.com/fission/fission/pkg/apis/core/v1"
 	"github.com/fission/fission/pkg/crd"
+	"github.com/fission/fission/pkg/mqtrigger"
+	"github.com/fission/fission/pkg/mqtrigger/factory"
 	"github.com/fission/fission/pkg/mqtrigger/messageQueue"
+	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/azurequeuestorage"
+	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/kafka"
+	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/nats"
 )

 func Start(logger *zap.Logger, routerUrl string) error {
-	fissionClient, _, _, err := crd.MakeFissionClient()
+	fissionClient, _, _, _, err := crd.MakeFissionClient()

 	if err != nil {
 		return errors.Wrap(err, "failed to get fission or kubernetes client")
@@ -42,8 +48,7 @@ func Start(logger *zap.Logger, routerUrl string) error {
 		return errors.Wrap(err, "error waiting for CRDs")
 	}

-	// Message queue type: nats is the only supported one for now
-	mqType := os.Getenv("MESSAGE_QUEUE_TYPE")
+	mqType := (fv1.MessageQueueType)(os.Getenv("MESSAGE_QUEUE_TYPE"))
 	mqUrl := os.Getenv("MESSAGE_QUEUE_URL")

 	secretsPath := strings.TrimSpace(os.Getenv("MESSAGE_QUEUE_SECRETS"))
@@ -57,17 +62,26 @@ func Start(logger *zap.Logger, routerUrl string) error {
 		}
 	}

-	mqCfg := messageQueue.MessageQueueConfig{
-		MQType:  mqType,
-		Url:     mqUrl,
-		Secrets: secrets,
+	mq, err := factory.Create(
+		logger,
+		mqType,
+		messageQueue.Config{
+			MQType:  (string)(mqType),
+			Url:     mqUrl,
+			Secrets: secrets,
+		},
+		routerUrl,
+	)
+	if err != nil {
+		logger.Fatal("failed to connect to remote message queue server", zap.Error(err))
 	}
-	messageQueue.MakeMessageQueueTriggerManager(logger, fissionClient, routerUrl, mqCfg)
+
+	mqtrigger.MakeMessageQueueTriggerManager(logger, fissionClient, mqType, mq).Run()
+
 	return nil
 }

 func readSecrets(logger *zap.Logger, secretsPath string) (map[string][]byte, error) {
-
 	// return if no secrets exist
 	if _, err := os.Stat(secretsPath); os.IsNotExist(err) {
 		return nil, err
@@ -3,9 +3,12 @@ package app
 import (
 	"github.com/spf13/cobra"

+	"github.com/fission/fission/pkg/controller/client"
+	"github.com/fission/fission/pkg/controller/client/rest"
 	"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
 	wrapper "github.com/fission/fission/pkg/fission-cli/cliwrapper/driver/cobra"
 	"github.com/fission/fission/pkg/fission-cli/cliwrapper/driver/cobra/helptemplate"
+	"github.com/fission/fission/pkg/fission-cli/cmd"
 	"github.com/fission/fission/pkg/fission-cli/cmd/canaryconfig"
 	"github.com/fission/fission/pkg/fission-cli/cmd/environment"
 	"github.com/fission/fission/pkg/fission-cli/cmd/function"
@@ -20,6 +23,10 @@ import (
 	"github.com/fission/fission/pkg/fission-cli/console"
 	"github.com/fission/fission/pkg/fission-cli/flag"
 	flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
+	"github.com/fission/fission/pkg/fission-cli/util"
+	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/azurequeuestorage"
+	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/kafka"
+	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/nats"
 )

 const (
@@ -40,6 +47,19 @@ func App() *cobra.Command {
 		PersistentPreRunE: wrapper.Wrapper(
 			func(input cli.Input) error {
 				console.Verbosity = input.Int(flagkey.Verbosity)
+
+				if input.IsSet(flagkey.ClientOnly) {
+					// TODO: use fake rest client for offline spec generation
+					cmd.SetClientset(client.MakeFakeClientset(nil))
+				} else {
+					serverUrl, err := util.GetServerURL(input)
+					if err != nil {
+						return err
+					}
+					restClient := rest.NewRESTClient(serverUrl)
+					cmd.SetClientset(client.MakeClientset(restClient))
+				}
+
 				return nil
 			},
 		),
@@ -53,7 +73,7 @@ func App() *cobra.Command {
 	})

 	wrapper.SetFlags(rootCmd, flag.FlagSet{
-		Global: []flag.Flag{flag.GlobalServer, flag.GlobalVerbosity},
+		Global: []flag.Flag{flag.GlobalServer, flag.GlobalVerbosity, flag.KubeContext},
 	})

 	groups := helptemplate.CommandGroups{}
@@ -66,7 +86,7 @@ func App() *cobra.Command {

 	flagExposer := helptemplate.ActsAsRootCommand(rootCmd, nil, groups...)
 	// show global options in usage
-	flagExposer.ExposeFlags(rootCmd, flagkey.Server, flagkey.Verbosity)
+	flagExposer.ExposeFlags(rootCmd, flagkey.Server, flagkey.Verbosity, flagkey.KubeContext)

 	return rootCmd
 }
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine as godep
+FROM golang:1.15-alpine as godep
 RUN apk add bash ca-certificates git gcc g++ libc-dev

 ARG GOPKG=github.com/fission/fission
@@ -12,7 +12,7 @@ COPY go.* ./

 RUN go mod download

-From godep as builder
+FROM godep as builder

 ARG GOPKG
 WORKDIR /go/src/${GOPKG}
@@ -31,13 +31,13 @@ ARG BUILDVERSION=unknown
 ARG BUILDDATE=unknown
 # E.g. BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')

-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
+RUN CGO_ENABLED=0 go build \
    -o /go/bin/pre-upgrade-checks \
    -gcflags=-trimpath=$GOPATH \
    -asmflags=-trimpath=$GOPATH \
    -ldflags "-X github.com/fission/fission/pkg/info.GitCommit=${GITCOMMIT} -X github.com/fission/fission/pkg/info.BuildDate=${BUILDDATE} -X github.com/fission/fission/pkg/info.Version=${BUILDVERSION}"

-FROM alpine:3.10 as base
+FROM alpine:3.13 as base
 RUN apk add --update ca-certificates
 COPY --from=builder /go/bin/pre-upgrade-checks /

@@ -21,6 +21,7 @@ import (

 	"github.com/docopt/docopt-go"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"

 	"github.com/fission/fission/pkg/info"
 )
@@ -34,11 +35,19 @@ func getStringArgWithDefault(arg interface{}, defaultValue string) string {
 }

 func main() {
-	logger, err := zap.NewProduction()
+	config := zap.NewProductionConfig()
+	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	logger, err := config.Build()
+
 	if err != nil {
 		log.Fatalf("can't initialize zap logger: %v", err)
 	}
-	defer logger.Sync()
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()

 	usage := `Package to perform operations needed prior to fission installation
 Usage:
@@ -47,7 +56,7 @@ Options:
  --fn-pod-namespace=<podNamespace>                        Namespace where function pods get deployed.
  --envbuilder-namespace=<envBuilderNamespace>             Namespace where builder env pods are deployed.`

-	arguments, err := docopt.Parse(usage, nil, true, info.BuildInfo().String(), false)
+	arguments, err := docopt.ParseArgs(usage, nil, info.BuildInfo().String())
 	if err != nil {
 		logger.Fatal("Could not parse command line arguments", zap.Error(err))
 	}
@@ -61,12 +70,15 @@ Options:
 			zap.Error(err))
 	}

-	if !crdBackedClient.IsFissionReInstall() {
+	crd := crdBackedClient.GetFunctionCRD()
+	if crd == nil {
 		logger.Info("nothing to do since CRDs are not present on the cluster")
 		return
 	}

+	err = crdBackedClient.LatestSchemaApplied()
+	if err != nil {
+		logger.Fatal("New CRDs are not applied")
+	}
 	crdBackedClient.VerifyFunctionSpecReferences()
-	crdBackedClient.RemoveClusterAdminRolesForFissionSAs()
-	crdBackedClient.SetupRoleBindings()
 }
@@ -17,20 +17,21 @@ limitations under the License.
 package main

 import (
+	"context"
 	"fmt"
+	"strings"

 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
+	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

-	fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
+	fv1 "github.com/fission/fission/pkg/apis/core/v1"
 	"github.com/fission/fission/pkg/crd"
-	"github.com/fission/fission/pkg/types"
-	"github.com/fission/fission/pkg/utils"
 )

 type (
@@ -47,10 +48,11 @@ type (
 const (
 	maxRetries  = 5
 	FunctionCRD = "functions.fission.io"
+	MqtCRD      = "messagequeuetriggers.fission.io"
 )

 func makePreUpgradeTaskClient(logger *zap.Logger, fnPodNs, envBuilderNs string) (*PreUpgradeTaskClient, error) {
-	fissionClient, k8sClient, apiExtClient, err := crd.MakeFissionClient()
+	fissionClient, k8sClient, apiExtClient, _, err := crd.MakeFissionClient()
 	if err != nil {
 		return nil, errors.Wrap(err, "error making fission client")
 	}
@@ -65,20 +67,52 @@ func makePreUpgradeTaskClient(logger *zap.Logger, fnPodNs, envBuilderNs string)
 	}, nil
 }

-// IsFissionReInstall checks if there is atleast one fission CRD, i.e. function in this case, on this cluster.
-// We need this to find out if fission had been previously installed on this cluster
-func (client *PreUpgradeTaskClient) IsFissionReInstall() bool {
+// GetFunctionCRD checks if function CRD is present on the cluster and returns it. It returns nil if not found
+// We can use this to find out if fission had been previously installed on this cluster too.
+func (client *PreUpgradeTaskClient) GetFunctionCRD() *v1.CustomResourceDefinition {
 	for i := 0; i < maxRetries; i++ {
-		_, err := client.apiExtClient.ApiextensionsV1beta1().CustomResourceDefinitions().Get(FunctionCRD, metav1.GetOptions{})
+		crd, err := client.apiExtClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), FunctionCRD, metav1.GetOptions{})
 		if err != nil && k8serrors.IsNotFound(err) {
-			return false
-		}
-		if err == nil {
-			return true
+			continue
 		}
+		return crd
+	}
+	return nil
+}
+
+// GetMqtCRD checks if MQT CRD is present on the cluster and returns it. It returns nil if not found
+func (client *PreUpgradeTaskClient) GetMqtCRD() *v1.CustomResourceDefinition {
+	crd, err := client.apiExtClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), MqtCRD, metav1.GetOptions{})
+	if err != nil {
+		client.logger.Error("Could not find MQT CRD", zap.Error(err))
+		return nil
+	}
+	return crd
+}
+
+// LatestSchemaApplied ensures that the end user has applied the latest CRDs generated to the cluster.
+// For future reference: whenever a new field is added, we need to check for that field's existence in this function
+func (client *PreUpgradeTaskClient) LatestSchemaApplied() error {
+	client.logger.Info("Checking if user has applied the latest CRDs")
+	funcCRD := client.GetFunctionCRD()
+	if funcCRD == nil {
+		return errors.New("Could not get the Function CRD")
+	}
+	// Any new field added in Function spec can be checked here provided the substring matches the description in CRD Validation of the field
+	if !strings.Contains(funcCRD.Spec.String(), "RequestsPerPod") || !strings.Contains(funcCRD.Spec.String(), "OnceOnly") {
+		return errors.New("Apply the newer CRDs before upgrading")
 	}

-	return false
+	mqtCRD := client.GetMqtCRD()
+	if mqtCRD == nil {
+		return errors.New("Could not get the MQT CRD")
+	}
+
+	// Any new field added in MQT spec can be checked here provided the substring matches the description in CRD Validation of the field
+	if !strings.Contains(mqtCRD.Spec.String(), "PodSpec") {
+		return errors.New("Apply the newer CRDs before upgrading")
+	}
+	return nil
 }

 // VerifyFunctionSpecReferences verifies that a function references secrets, configmaps, pkgs in its own namespace and
@@ -90,7 +124,7 @@ func (client *PreUpgradeTaskClient) VerifyFunctionSpecReferences() {
 	var fList *fv1.FunctionList

 	for i := 0; i < maxRetries; i++ {
-		fList, err = client.fissionClient.Functions(metav1.NamespaceAll).List(metav1.ListOptions{})
+		fList, err = client.fissionClient.CoreV1().Functions(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
 		if err == nil {
 			break
 		}
@@ -108,20 +142,20 @@ func (client *PreUpgradeTaskClient) VerifyFunctionSpecReferences() {
 	for _, fn := range fList.Items {
 		secrets := fn.Spec.Secrets
 		for _, secret := range secrets {
-			if secret.Namespace != fn.Metadata.Namespace {
-				errs = multierror.Append(errs, fmt.Errorf("function : %s.%s cannot reference a secret : %s in namespace : %s", fn.Metadata.Name, fn.Metadata.Namespace, secret.Name, secret.Namespace))
+			if secret.Namespace != fn.ObjectMeta.Namespace {
+				errs = multierror.Append(errs, fmt.Errorf("function : %s.%s cannot reference a secret : %s in namespace : %s", fn.ObjectMeta.Name, fn.ObjectMeta.Namespace, secret.Name, secret.Namespace))
 			}
 		}

 		configmaps := fn.Spec.ConfigMaps
 		for _, configmap := range configmaps {
-			if configmap.Namespace != fn.Metadata.Namespace {
-				errs = multierror.Append(errs, fmt.Errorf("function : %s.%s cannot reference a configmap : %s in namespace : %s", fn.Metadata.Name, fn.Metadata.Namespace, configmap.Name, configmap.Namespace))
+			if configmap.Namespace != fn.ObjectMeta.Namespace {
+				errs = multierror.Append(errs, fmt.Errorf("function : %s.%s cannot reference a configmap : %s in namespace : %s", fn.ObjectMeta.Name, fn.ObjectMeta.Namespace, configmap.Name, configmap.Namespace))
 			}
 		}

-		if fn.Spec.Package.PackageRef.Namespace != fn.Metadata.Namespace {
-			errs = multierror.Append(errs, fmt.Errorf("function : %s.%s cannot reference a package : %s in namespace : %s", fn.Metadata.Name, fn.Metadata.Namespace, fn.Spec.Package.PackageRef.Name, fn.Spec.Package.PackageRef.Namespace))
+		if fn.Spec.Package.PackageRef.Namespace != fn.ObjectMeta.Namespace {
+			errs = multierror.Append(errs, fmt.Errorf("function : %s.%s cannot reference a package : %s in namespace : %s", fn.ObjectMeta.Name, fn.ObjectMeta.Namespace, fn.Spec.Package.PackageRef.Name, fn.Spec.Package.PackageRef.Namespace))
 		}
 	}

@@ -133,90 +167,3 @@ func (client *PreUpgradeTaskClient) VerifyFunctionSpecReferences() {

 	client.logger.Info("function spec references verified")
 }
-
-// deleteClusterRoleBinding deletes the clusterRoleBinding passed as an argument to it.
-// If its not present, it just ignores and returns no errors
-func (client *PreUpgradeTaskClient) deleteClusterRoleBinding(clusterRoleBinding string) (err error) {
-	for i := 0; i < maxRetries; i++ {
-		err = client.k8sClient.RbacV1beta1().ClusterRoleBindings().Delete(clusterRoleBinding, &metav1.DeleteOptions{})
-		if err != nil && k8serrors.IsNotFound(err) || err == nil {
-			return nil
-		}
-	}
-
-	return err
-}
-
-// RemoveClusterAdminRolesForFissionSAs deletes the clusterRoleBindings previously created on this cluster
-func (client *PreUpgradeTaskClient) RemoveClusterAdminRolesForFissionSAs() {
-	clusterRoleBindings := []string{"fission-builder-crd", "fission-fetcher-crd"}
-	for _, clusterRoleBinding := range clusterRoleBindings {
-		err := client.deleteClusterRoleBinding(clusterRoleBinding)
-		if err != nil {
-			client.logger.Fatal("error deleting rolebinding",
-				zap.Error(err),
-				zap.String("role_binding", clusterRoleBinding))
-		}
-	}
-
-	client.logger.Info("femoved cluster admin privileges for fission-builder and fission-fetcher service accounts")
-}
-
-// NeedRoleBindings checks if there is atleast one package or function in default namespace.
-// It is needed to find out if package-getter-rb and secret-configmap-getter-rb needs to be created for fission-fetcher
-// and fission-builder service accounts.
-// This is because, we just deleted the ClusterRoleBindings for these service accounts in the previous function and
-// for the existing functions to work, we need to give these SAs the right privileges
-func (client *PreUpgradeTaskClient) NeedRoleBindings() bool {
-	pkgList, err := client.fissionClient.Packages(metav1.NamespaceDefault).List(metav1.ListOptions{})
-	if err == nil && len(pkgList.Items) > 0 {
-		return true
-	}
-
-	fnList, err := client.fissionClient.Functions(metav1.NamespaceDefault).List(metav1.ListOptions{})
-	if err == nil && len(fnList.Items) > 0 {
-		return true
-	}
-
-	return false
-}
-
-// Setup appropriate role bindings for fission-fetcher and fission-builder SAs
-func (client *PreUpgradeTaskClient) SetupRoleBindings() {
-	if !client.NeedRoleBindings() {
-		client.logger.Info("no fission objects found, so no role-bindings to create")
-		return
-	}
-
-	// the fact that we're here implies that there had been a prior installation of fission and objects are present still
-	// so, we go ahead and create the role-bindings necessary for the fission-fetcher and fission-builder Service Accounts.
-	err := utils.SetupRoleBinding(client.logger, client.k8sClient, types.PackageGetterRB, metav1.NamespaceDefault, types.PackageGetterCR, types.ClusterRole, types.FissionFetcherSA, client.fnPodNs)
-	if err != nil {
-		client.logger.Fatal("error setting up rolebinding for service account",
-			zap.Error(err),
-			zap.String("role_binding", types.PackageGetterRB),
-			zap.String("service_account", types.FissionFetcherSA),
-			zap.String("service_account_namespace", client.fnPodNs))
-	}
-
-	err = utils.SetupRoleBinding(client.logger, client.k8sClient, types.PackageGetterRB, metav1.NamespaceDefault, types.PackageGetterCR, types.ClusterRole, types.FissionBuilderSA, client.envBuilderNs)
-	if err != nil {
-		client.logger.Fatal("error setting up rolebinding for service account",
-			zap.Error(err),
-			zap.String("role_binding", types.PackageGetterRB),
-			zap.String("service_account", types.FissionBuilderSA),
-			zap.String("service_account_namespace", client.envBuilderNs))
-	}
-
-	err = utils.SetupRoleBinding(client.logger, client.k8sClient, types.SecretConfigMapGetterRB, metav1.NamespaceDefault, types.SecretConfigMapGetterCR, types.ClusterRole, types.FissionFetcherSA, client.fnPodNs)
-	if err != nil {
-		client.logger.Fatal("error setting up rolebinding for service account",
-			zap.Error(err),
-			zap.String("role_binding", types.SecretConfigMapGetterRB),
-			zap.String("service_account", types.FissionFetcherSA),
-			zap.String("service_account_namespace", client.fnPodNs))
-	}
-
-	client.logger.Info("created rolebindings in default namespace",
-		zap.Strings("role_bindings", []string{types.PackageGetterRB, types.SecretConfigMapGetterRB}))
-}
@@ -0,0 +1,43 @@
+FROM golang:1.15-alpine as godep
+RUN apk add bash ca-certificates git gcc g++ libc-dev
+
+ARG GOPKG=github.com/fission/fission
+
+ENV GO111MODULE=on
+
+WORKDIR /go/src/${GOPKG}
+
+# To reuse build cache, copy go.mod & go.sum and download dependencies first.
+COPY go.* ./
+
+RUN go mod download
+
+FROM godep as builder
+
+ARG GOPKG
+WORKDIR /go/src/${GOPKG}
+
+# Copy whole fission directory to work dir
+COPY ./ ./
+
+WORKDIR /go/src/${GOPKG}/cmd/reporter
+
+ARG GITCOMMIT=unknown
+# E.g. GITCOMMIT=$(git rev-parse HEAD)
+
+ARG BUILDVERSION=unknown
+# E.g. BUILDVERSION=$(git rev-parse HEAD)
+
+ARG BUILDDATE=unknown
+# E.g. BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+RUN CGO_ENABLED=0 go build \
+    -o /go/bin/reporter \
+    -gcflags=-trimpath=$GOPATH \
+    -asmflags=-trimpath=$GOPATH \
+    -ldflags "-X github.com/fission/fission/pkg/info.GitCommit=${GITCOMMIT} -X github.com/fission/fission/pkg/info.BuildDate=${BUILDDATE} -X github.com/fission/fission/pkg/info.Version=${BUILDVERSION}"
+
+FROM alpine:3.13 as base
+RUN apk add --update ca-certificates
+COPY --from=builder /go/bin/reporter /
+ENTRYPOINT ["/reporter"]
@@ -0,0 +1,33 @@
+/*
+Copyright 2021 The Fission Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package app
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func App() *cobra.Command {
+	cobra.EnableCommandSorting = false
+	rootCmd := &cobra.Command{
+		Use:       "reporter",
+		Short:     "Report fission events to analytics service",
+		ValidArgs: []string{"event"},
+		Args:      cobra.OnlyValidArgs,
+	}
+	rootCmd.AddCommand(EventCommand())
+	return rootCmd
+}
@@ -0,0 +1,76 @@
+/*
+Copyright 2021 The Fission Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package app
+
+import (
+	"log"
+
+	"github.com/fission/fission/pkg/tracker"
+	"github.com/spf13/cobra"
+)
+
+func eventCommandHandler(cmd *cobra.Command, args []string) error {
+	var err error
+	flags := cmd.PersistentFlags()
+
+	event := tracker.Event{}
+
+	event.Category, err = flags.GetString("category")
+	if err != nil {
+		return err
+	}
+
+	event.Action, err = flags.GetString("action")
+	if err != nil {
+		return err
+	}
+
+	event.Label, err = flags.GetString("label")
+	if err != nil {
+		return err
+	}
+
+	event.Value, err = flags.GetString("value")
+	if err != nil {
+		return err
+	}
+
+	return tracker.Tracker.SendEvent(event)
+}
+
+//EventCommand reports an event to analytics
+func EventCommand() *cobra.Command {
+	eventCmd := &cobra.Command{
+		Use:   "event",
+		Short: "Report event to analytics",
+		RunE:  eventCommandHandler,
+		Args:  cobra.NoArgs,
+	}
+	persistentFlags := eventCmd.PersistentFlags()
+	persistentFlags.StringP("category", "c", "", "event category")
+	persistentFlags.StringP("action", "a", "", "event action")
+	persistentFlags.StringP("label", "l", "", "event label")
+	persistentFlags.StringP("value", "v", "", "event value")
+	err := eventCmd.MarkPersistentFlagRequired("category")
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = eventCmd.MarkPersistentFlagRequired("action")
+	if err != nil {
+		log.Fatal(err)
+	}
+	return eventCmd
+}
@@ -0,0 +1,30 @@
+/*
+Copyright 2021 The Fission Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"log"
+
+	"github.com/fission/fission/cmd/reporter/app"
+)
+
+func main() {
+	err := app.App().Execute()
+	if err != nil {
+		log.Fatal(err)
+	}
+}
@@ -0,0 +1,81 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: canaryconfigs.fission.io
+spec:
+  group: fission.io
+  names:
+    kind: CanaryConfig
+    listKind: CanaryConfigList
+    plural: canaryconfigs
+    singular: canaryconfig
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: CanaryConfig is for canary deployment of two functions.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: CanaryConfigSpec defines the canary configuration spec
+            properties:
+              duration:
+                description: 'Weight increment interval, string representation of time.Duration, ex : 1m, 2h, 2d (default: "2m")'
+                type: string
+              failureType:
+                description: FailureType refers to the type of failure
+                type: string
+              failurethreshold:
+                description: Threshold in percentage beyond which the new version of the function is considered unstable
+                type: integer
+              newfunction:
+                description: New version of the function
+                type: string
+              oldfunction:
+                description: Old stable version of the function
+                type: string
+              trigger:
+                description: HTTP trigger that this config references
+                type: string
+              weightincrement:
+                description: Weight increment step for function
+                type: integer
+            required:
+            - newfunction
+            - oldfunction
+            - trigger
+            type: object
+          status:
+            description: CanaryConfigStatus represents canary config status
+            properties:
+              status:
+                type: string
+            required:
+            - status
+            type: object
+        required:
+        - metadata
+        - spec
+        - status
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
@@ -0,0 +1,177 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: functions.fission.io
+spec:
+  group: fission.io
+  names:
+    kind: Function
+    listKind: FunctionList
+    plural: functions
+    shortNames:
+    - fn
+    singular: function
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Function is function runs within environment runtime with given package and secrets/configmaps.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: FunctionSpec describes the contents of the function.
+            properties:
+              InvokeStrategy:
+                description: InvokeStrategy is a set of controls which affect how function executes
+                properties:
+                  ExecutionStrategy:
+                    description: ExecutionStrategy specifies low-level parameters for function execution, such as the number of instances.
+                    properties:
+                      ExecutorType:
+                        description: "ExecutorType is the executor type of a function used. Defaults to \"poolmgr\". \n Available value:  - poolmgr  - newdeploy"
+                        type: string
+                      MaxScale:
+                        description: This is only for newdeploy to set up maximum replicas of deployment.
+                        type: integer
+                      MinScale:
+                        description: This is only for newdeploy to set up minimum replicas of deployment.
+                        type: integer
+                      SpecializationTimeout:
+                        description: This is the timeout setting for executor to wait for pod specialization.
+                        type: integer
+                      TargetCPUPercent:
+                        description: This is only for newdeploy to set up target CPU utilization of HPA.
+                        type: integer
+                    type: object
+                  StrategyType:
+                    description: StrategyType is the strategy type of a function. Now it only supports 'execution'.
+                    type: string
+                type: object
+              concurrency:
+                description: Maximum number of pods to be specialized which will serve requests This is optional. If not specified default value will be taken as 500
+                type: integer
+              configmaps:
+                description: Reference to a list of configmaps.
+                items:
+                  description: ConfigMapReference is a reference to a kubernetes configmap.
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                nullable: true
+                type: array
+              environment:
+                description: Environment is the build and runtime environment that this function is associated with. An Environment with this name should exist, otherwise the function cannot be invoked.
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
+              functionTimeout:
+                description: FunctionTimeout provides a maximum amount of duration within which a request for a particular function execution should be complete. This is optional. If not specified default value will be taken as 60s
+                type: integer
+              idletimeout:
+                description: IdleTimeout specifies the length of time that a function is idle before the function pod(s) are eligible for deletion. If no traffic to the function is detected within the idle timeout, the executor will then recycle the function pod(s) to release resources.
+                type: integer
+              onceOnly:
+                description: OnceOnly specifies if specialized pod will serve exactly one request in its lifetime and would be garbage collected after serving that one request This is optional. If not specified default value will be taken as false
+                type: boolean
+              package:
+                description: Reference to a package containing deployment and optionally the source.
+                properties:
+                  functionName:
+                    description: "FunctionName specifies a specific function within the package. This allows functions to share packages, by having different functions within the same package. \n Fission itself does not interpret this path. It is passed verbatim to build and runtime environments. \n This is optional: if unspecified, the environment has a default name."
+                    type: string
+                  packageref:
+                    description: Package reference
+                    properties:
+                      name:
+                        type: string
+                      namespace:
+                        type: string
+                      resourceversion:
+                        description: Including resource version in the reference forces the function to be updated on package update, making it possible to cache the function based on its metadata.
+                        type: string
+                    type: object
+                type: object
+              requestsPerPod:
+                description: RequestsPerPod indicates the maximum number of concurrent requests that can be served by a specialized pod This is optional. If not specified default value will be taken as 1
+                type: integer
+              resources:
+                description: cpu and memory resources as per K8S standards This is only for newdeploy to set up resource limitation when creating deployment for a function.
+                properties:
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                    type: object
+                type: object
+              secrets:
+                description: Reference to a list of secrets.
+                items:
+                  description: SecretReference is a reference to a kubernetes secret.
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                nullable: true
+                type: array
+            required:
+            - InvokeStrategy
+            - environment
+            - package
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
@@ -0,0 +1,109 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: httptriggers.fission.io
+spec:
+  group: fission.io
+  names:
+    kind: HTTPTrigger
+    listKind: HTTPTriggerList
+    plural: httptriggers
+    singular: httptrigger
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: HTTPTrigger is the trigger invokes user functions when receiving HTTP requests.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: HTTPTriggerSpec is for router to expose user functions at the given URL path.
+            properties:
+              createingress:
+                description: If CreateIngress is true, router will create a ingress definition.
+                type: boolean
+              functionref:
+                description: FunctionReference is a reference to the target function.
+                properties:
+                  functionweights:
+                    additionalProperties:
+                      type: integer
+                    description: Function Reference by weight. this map contains function name as key and its weight as the value. This is for canary upgrade purpose.
+                    nullable: true
+                    type: object
+                  name:
+                    description: Name of the function.
+                    type: string
+                  type:
+                    description: 'Type indicates whether this function reference is by name or selector. For now, the only supported reference type is by "name".  Future reference types:   * Function by label or annotation   * Branch or tag of a versioned function   * A "rolling upgrade" from one version of a function to another Available value: - name - function-weights'
+                    type: string
+                required:
+                - name
+                - type
+                type: object
+              host:
+                description: 'TODO: remove this field since we have IngressConfig already Deprecated: the original idea of this field is not for setting Ingress. Since we have IngressConfig now, remove Host after couple releases.'
+                type: string
+              ingressconfig:
+                description: 'TODO: make IngressConfig a independent Fission resource IngressConfig for router to set up Ingress.'
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations will be add to metadata when creating Ingress.
+                    nullable: true
+                    type: object
+                  host:
+                    description: Host is for ingress controller to apply rules. If host is empty or "*", the rule applies to all inbound HTTP traffic.
+                    type: string
+                  path:
+                    description: Path is for path matching. The format of path depends on what ingress controller you used.
+                    type: string
+                  tls:
+                    description: TLS is for user to specify a Secret that contains TLS key and certificate. The domain name in the key and crt must match the value of Host field.
+                    type: string
+                type: object
+              method:
+                description: Use Methods instead of Method. This field is going to be deprecated in a future release HTTP method to access a function.
+                type: string
+              methods:
+                description: HTTP methods to access a function
+                items:
+                  type: string
+                type: array
+              prefix:
+                description: 'Prefix with which functions are exposed. NOTE: Prefix takes precedence over URL/RelativeURL. Note that it does not treat slashes specially ("/foobar/" will be matched by the prefix "/foobar").'
+                type: string
+              relativeurl:
+                description: RelativeURL is the exposed URL for external client to access a function with.
+                type: string
+            required:
+            - functionref
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
@@ -0,0 +1,82 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: kuberneteswatchtriggers.fission.io
+spec:
+  group: fission.io
+  names:
+    kind: KubernetesWatchTrigger
+    listKind: KubernetesWatchTriggerList
+    plural: kuberneteswatchtriggers
+    singular: kuberneteswatchtrigger
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: KubernetesWatchTrigger watches kubernetes resource events and invokes functions.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: KubernetesWatchTriggerSpec defines spec of KuberenetesWatchTrigger
+            properties:
+              functionref:
+                description: The reference to a function for kubewatcher to invoke with when receiving events.
+                properties:
+                  functionweights:
+                    additionalProperties:
+                      type: integer
+                    description: Function Reference by weight. this map contains function name as key and its weight as the value. This is for canary upgrade purpose.
+                    nullable: true
+                    type: object
+                  name:
+                    description: Name of the function.
+                    type: string
+                  type:
+                    description: 'Type indicates whether this function reference is by name or selector. For now, the only supported reference type is by "name".  Future reference types:   * Function by label or annotation   * Branch or tag of a versioned function   * A "rolling upgrade" from one version of a function to another Available value: - name - function-weights'
+                    type: string
+                required:
+                - name
+                - type
+                type: object
+              labelselector:
+                additionalProperties:
+                  type: string
+                description: Resource labels
+                type: object
+              namespace:
+                type: string
+              type:
+                description: Type of resource to watch (Pod, Service, etc.)
+                type: string
+            required:
+            - functionref
+            - namespace
+            - type
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
@@ -0,0 +1,127 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: packages.fission.io
+spec:
+  group: fission.io
+  names:
+    kind: Package
+    listKind: PackageList
+    plural: packages
+    shortNames:
+    - pkg
+    singular: package
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Package Think of these as function-level images.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PackageSpec includes source/deploy archives and the reference of environment to build the package.
+            properties:
+              buildcmd:
+                description: BuildCommand is a custom build command that builder used to build the source archive.
+                type: string
+              deployment:
+                description: Deployment is the deployable archive that environment runtime used to run user function.
+                properties:
+                  checksum:
+                    description: Checksum ensures the integrity of packages referenced by URL. Ignored for literals.
+                    properties:
+                      sum:
+                        type: string
+                      type:
+                        description: ChecksumType specifies the checksum algorithm, such as sha256, used for a checksum.
+                        type: string
+                    type: object
+                  literal:
+                    description: Literal contents of the package. Can be used for encoding packages below TODO (256KB?) size.
+                    format: byte
+                    type: string
+                  type:
+                    description: 'Type defines how the package is specified: literal or URL. Available value:  - literal  - url'
+                    type: string
+                  url:
+                    description: URL references a package.
+                    type: string
+                type: object
+              environment:
+                description: Environment is a reference to the environment for building source archive.
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
+              source:
+                description: Source is the archive contains source code and dependencies file. If the package status is in PENDING state, builder manager will then notify builder to compile source and save the result as deployable archive.
+                properties:
+                  checksum:
+                    description: Checksum ensures the integrity of packages referenced by URL. Ignored for literals.
+                    properties:
+                      sum:
+                        type: string
+                      type:
+                        description: ChecksumType specifies the checksum algorithm, such as sha256, used for a checksum.
+                        type: string
+                    type: object
+                  literal:
+                    description: Literal contents of the package. Can be used for encoding packages below TODO (256KB?) size.
+                    format: byte
+                    type: string
+                  type:
+                    description: 'Type defines how the package is specified: literal or URL. Available value:  - literal  - url'
+                    type: string
+                  url:
+                    description: URL references a package.
+                    type: string
+                type: object
+            required:
+            - environment
+            type: object
+          status:
+            description: Status indicates the build status of package.
+            properties:
+              buildlog:
+                description: BuildLog stores build log during the compilation.
+                type: string
+              buildstatus:
+                default: Pending
+                description: BuildStatus is the package build status.
+                type: string
+              lastUpdateTimestamp:
+                description: LastUpdateTimestamp will store the timestamp the package was last updated metav1.Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON. https://github.com/kubernetes/apimachinery/blob/44bd77c24ef93cd3a5eb6fef64e514025d10d44e/pkg/apis/meta/v1/time.go#L26-L35
+                format: date-time
+                nullable: true
+                type: string
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
@@ -0,0 +1,74 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.5.0
+  creationTimestamp: null
+  name: timetriggers.fission.io
+spec:
+  group: fission.io
+  names:
+    kind: TimeTrigger
+    listKind: TimeTriggerList
+    plural: timetriggers
+    singular: timetrigger
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: TimeTrigger invokes functions based on given cron schedule.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TimeTriggerSpec invokes the specific function at a time or times specified by a cron string.
+            properties:
+              cron:
+                description: Cron schedule
+                type: string
+              functionref:
+                description: The reference to function
+                properties:
+                  functionweights:
+                    additionalProperties:
+                      type: integer
+                    description: Function Reference by weight. this map contains function name as key and its weight as the value. This is for canary upgrade purpose.
+                    nullable: true
+                    type: object
+                  name:
+                    description: Name of the function.
+                    type: string
+                  type:
+                    description: 'Type indicates whether this function reference is by name or selector. For now, the only supported reference type is by "name".  Future reference types:   * Function by label or annotation   * Branch or tag of a versioned function   * A "rolling upgrade" from one version of a function to another Available value: - name - function-weights'
+                    type: string
+                required:
+                - name
+                - type
+                type: object
+            required:
+            - cron
+            - functionref
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  group: fission.io
+resources:
+  - fission.io_canaryconfigs.yaml
+  - fission.io_environments.yaml
+  - fission.io_functions.yaml
+  - fission.io_httptriggers.yaml
+  - fission.io_kuberneteswatchtriggers.yaml
+  - fission.io_messagequeuetriggers.yaml
+  - fission.io_packages.yaml
+  - fission.io_timetriggers.yaml
@@ -1,12 +1,15 @@
 package main

 import (
+	"log"
 	"net/http"
 )

 // Handler is the entry point for this fission function
-
-func Handler(w http.ResponseWriter, r *http.Request) {
+func Handler(w http.ResponseWriter, r *http.Request) { //nolint: deadcode
 	msg := "Hello, CNCF Webinar!\n"
-	w.Write([]byte(msg))
+	_, err := w.Write([]byte(msg))
+	if err != nil {
+		log.Fatal(err)
+	}
 }
@@ -1,18 +0,0 @@
-FROM golang:onbuild
-
-WORKDIR /go
-COPY *.go /go/
-
-RUN GOOS=linux GOARCH=386 go build -o server .
-
-FROM alpine:3.5
-
-WORKDIR /app
-
-RUN apk update
-RUN apk add coreutils binutils findutils grep
-
-COPY --from=0 /go/server /app/server
-
-EXPOSE 8888
-ENTRYPOINT ["./server"]
@@ -1,59 +0,0 @@
-# Binary Environment Examples
-
-The `binary` runtime is a go server that uses a subprocess to invoke executables or execute shell scripts.
-
-Use Cases
- Execute bash scripts
- Execute arbitrary binaries (such as common sysadmin tools)
- Get support in _any_ programming language by executing the generated executable.
-
-
-⚠️ **Words of Caution** ⚠️
-
-The environment runs on an alpine image with some additional utility commandline tools installed, such as 'grep'. 
-However, in case you want to make use of more esoteric commandline tools, you should add the relevant apk to the 
-Dockerfile and build a new binary environment. See 'Compiling' for instructions.
-
-When executing functions using binaries, **ensure that the executable is built for the right architecture**. 
-Using the default binary environment this means that the binary should be build for Linux.
-
-Looking for ready-to-run examples? See the [binary examples directory](../../examples/binary).
-
-## Usage
-To get started with the latest binary environment:
-
-```bash
-fission env create --name binary --image fission/binary-env --builder fission/binary-builder
-```
-
-The interface to the executable used by this environment is somewhat similar to a [CGI interface](https://en.wikipedia.org/wiki/Common_Gateway_Interface).
-This means that any HTTP headers are converted to environment variables of the form "HTTP_<header-name>". For example these
-are some of frequently occurring headers:
-
-```bash
-# Request Metadata
-CONTENT_LENGTH
-REQUEST_URI
-REQUEST_METHOD
-
-# HTTP Headers
-HTTP_ACCEPT
-HTTP_USER-AGENT
-HTTP_CONTENT-TYPE
-# ...
-```
-
-The body of HTTP piped over the STDIN to the executable. 
-All output that is provided to the server over the STDOUT will be transformed into the HTTP response.
-
-## Compiling
-
-To build the runtime environment:
-```bash
-docker build --tag=${USER}/binary-env .
-```
-
-To build the builder environment:
-```bash
-(cd builder/ && docker build --tag=${USER}/binary-builder .)
-```
@@ -1,4 +0,0 @@
-ARG BUILDER_IMAGE=fission/builder:latest
-FROM ${BUILDER_IMAGE}
-
-ADD build.sh /usr/local/bin/build
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-apk update
-
-CWD=$(pwd)
-
-if [ -f ${SRC_PKG}/build.sh ]; then
-    cd ${SRC_PKG}
-    ./build.sh
-    cd ${CWD}
-fi
-
-cp -rf ${SRC_PKG} ${DEPLOY_PKG}
@@ -1,45 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-)
-
-// Utility functions for working with environment variables
-type Env struct {
-	Vars []*EnvVar
-}
-
-type EnvVar struct {
-	Key string
-	Val string
-}
-
-func FromString(rawEnvVar string) *EnvVar {
-	parts := strings.SplitN(rawEnvVar, "=", 2)
-	return &EnvVar{parts[0], parts[1]}
-}
-
-func (ev *EnvVar) ToString() string {
-	return fmt.Sprintf("%s=%s", ev.Key, ev.Val)
-}
-
-func (e *Env) SetEnv(envVar *EnvVar) {
-	e.Vars = append(e.Vars, envVar)
-}
-
-func (e *Env) ToStringEnv() []string {
-	var result []string
-	for _, envVar := range e.Vars {
-		result = append(result, envVar.ToString())
-	}
-	return result
-}
-
-func NewEnv(stringEnv []string) *Env {
-	env := &Env{}
-	for _, rawEnvVar := range stringEnv {
-		env.SetEnv(FromString(rawEnvVar))
-	}
-	return env
-}
@@ -1,178 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	DEFAULT_CODE_PATH          = "/userfunc/user"
-	DEFAULT_INTERNAL_CODE_PATH = "/bin/userfunc"
-)
-
-var specialized bool
-
-type (
-	BinaryServer struct {
-		fetchedCodePath  string
-		internalCodePath string
-	}
-
-	FunctionLoadRequest struct {
-		// FilePath is an absolute filesystem path to the
-		// function. What exactly is stored here is
-		// env-specific. Optional.
-		FilePath string `json:"filepath"`
-
-		// FunctionName has an environment-specific meaning;
-		// usually, it defines a function within a module
-		// containing multiple functions. Optional; default is
-		// environment-specific.
-		FunctionName string `json:"functionName"`
-
-		// URL to expose this function at. Optional; defaults
-		// to "/".
-		URL string `json:"url"`
-	}
-)
-
-func (bs *BinaryServer) SpecializeHandler(w http.ResponseWriter, r *http.Request) {
-	if specialized {
-		w.WriteHeader(http.StatusBadRequest)
-		w.Write([]byte("Not a generic container"))
-		return
-	}
-
-	request := FunctionLoadRequest{}
-
-	codePath := bs.fetchedCodePath
-	err := json.NewDecoder(r.Body).Decode(&request)
-	switch {
-	case err == io.EOF:
-	case err != nil:
-		panic(err)
-	}
-
-	if request.FilePath != "" {
-		fileStat, err := os.Stat(request.FilePath)
-		if err != nil {
-			panic(err)
-		}
-
-		codePath = request.FilePath
-		switch mode := fileStat.Mode(); {
-		case mode.IsDir():
-			codePath = filepath.Join(request.FilePath, request.FunctionName)
-		}
-	}
-
-	_, err = os.Stat(codePath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			w.WriteHeader(http.StatusNotFound)
-			w.Write([]byte(codePath + ": not found"))
-			return
-		} else {
-			panic(err)
-		}
-	}
-
-	// Future: Check if executable is correct architecture/executable.
-
-	// Copy the executable to ensure that file is executable and immutable.
-	userFunc, err := ioutil.ReadFile(codePath)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte("Failed to read executable."))
-		return
-	}
-	err = ioutil.WriteFile(bs.internalCodePath, userFunc, 0555)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte("Failed to write executable to target location."))
-		return
-	}
-
-	fmt.Println("Specializing ...")
-	specialized = true
-	fmt.Println("Done")
-}
-
-func (bs *BinaryServer) InvocationHandler(w http.ResponseWriter, r *http.Request) {
-	if !specialized {
-		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte("Generic container: no requests supported"))
-		return
-	}
-
-	// CGI-like passing of environment variables
-	execEnv := NewEnv(nil)
-	execEnv.SetEnv(&EnvVar{"REQUEST_METHOD", r.Method})
-	execEnv.SetEnv(&EnvVar{"REQUEST_URI", r.RequestURI})
-	execEnv.SetEnv(&EnvVar{"CONTENT_LENGTH", fmt.Sprintf("%d", r.ContentLength)})
-
-	for header, val := range r.Header {
-		execEnv.SetEnv(&EnvVar{fmt.Sprintf("HTTP_%s", strings.ToUpper(header)), val[0]})
-	}
-
-	// Future: could be improved by keeping subprocess open while environment is specialized
-	cmd := exec.Command(bs.internalCodePath)
-	cmd.Env = execEnv.ToStringEnv()
-
-	if r.ContentLength != 0 {
-		fmt.Println(r.ContentLength)
-		stdin, err := cmd.StdinPipe()
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(fmt.Sprintf("Failed to get STDIN pipe: %s", err)))
-			panic(err)
-		}
-		_, err = io.Copy(stdin, r.Body)
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(fmt.Sprintf("Failed to pipe input: %s", err)))
-		}
-		stdin.Close()
-	}
-
-	out, err := cmd.Output()
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte(fmt.Sprintf("Function error: %s", err)))
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-	w.Write(out)
-}
-
-func main() {
-	codePath := flag.String("c", DEFAULT_CODE_PATH, "Path to expected fetched executable.")
-	internalCodePath := flag.String("i", DEFAULT_INTERNAL_CODE_PATH, "Path to specialized executable.")
-	flag.Parse()
-	absInternalCodePath, err := filepath.Abs(*internalCodePath)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("Using fetched code path: %s\n", *codePath)
-	fmt.Printf("Using internal code path: %s\n", absInternalCodePath)
-
-	server := &BinaryServer{*codePath, absInternalCodePath}
-	http.HandleFunc("/", server.InvocationHandler)
-	http.HandleFunc("/specialize", server.SpecializeHandler)
-	http.HandleFunc("/v2/specialize", server.SpecializeHandler)
-
-	fmt.Println("Listening on 8888 ...")
-	err = http.ListenAndServe(":8888", nil)
-	if err != nil {
-		panic(err)
-	}
-}
@@ -1,6 +0,0 @@
-bin/*
-obj/*
-out/*
-.vscode/*
-project.lock*
-TODO_dotnet
@@ -1,15 +0,0 @@
-FROM microsoft/dotnet:1.1-sdk AS builder
-
-COPY * /proj/
-RUN cd /proj && ./project-build.sh
-
-# Build env image
-FROM microsoft/dotnet:1.1.0-runtime
-
-WORKDIR /fission-workdir
-COPY --from=builder /proj/out .
-EXPOSE 8888
-
-ENTRYPOINT ["dotnet"]
-
-CMD ["fission-dotnet.dll"]
@@ -1,82 +0,0 @@
-using Fission.DotNetCore.Compiler;
-using Fission.DotNetCore.Api;
-using System.Collections.Generic;
-using Nancy;
-using System.IO;
-using System;
-
-namespace Fission.DotNetCore
-{
-    public class ExecutorModule : NancyModule
-    {
-#if DEBUG
-        private const string CODE_PATH = "/tmp/func.cs";
-#else
-        private const string CODE_PATH = "/userfunc/user";
-#endif
-        private static Function _userFunc;
-        private static Logger _logger = new Logger();
-
-        public ExecutorModule()
-        {
-            Post("/specialize", args => Specialize());
-            Get("/", _ => Run());
-            Post("/", _ => Run());
-            Put("/", _ => Run());
-            Head("/", _ => Run());
-            Options("/", _ => Run());
-            Delete("/", _ => Run());
-        }
-
-        private object Specialize()
-        {
-            var errors = new List<string>();
-            if (File.Exists(CODE_PATH))
-            {
-                var code = File.ReadAllText(CODE_PATH);
-                _userFunc = FissionCompiler.Compile(code, out errors);
-                if (_userFunc == null)
-                {
-                    var errstr = string.Join(Environment.NewLine, errors);
-                    _logger.WriteError(errstr);
-                    var response = (Response)errstr;
-                    response.StatusCode = HttpStatusCode.InternalServerError;
-                    return response;
-
-                }
-                return null;
-            }
-            else
-            {
-                var errstr = $"Unable to locate code at '{CODE_PATH}'";
-                _logger.WriteError(errstr);
-                var response = (Response)errstr;
-                response.StatusCode = HttpStatusCode.InternalServerError;
-                return response;
-            }
-        }
-
-        private object Run()
-        {
-            if (_userFunc == null)
-            {
-                var response = (Response)"Generic container: no requests supported";
-                response.StatusCode = HttpStatusCode.InternalServerError;
-                return response;
-            }
-            
-            try
-            {
-                return _userFunc.Invoke(FissionContext.Build(Request, new Logger()));
-            }
-            catch (Exception e)
-            {
-                _logger.WriteError(e.ToString());
-                var response = (Response)e.Message;
-                response.StatusCode = HttpStatusCode.BadRequest;
-                return response;
-            }
-        }
-    }
-}
-
@@ -1,75 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Emit;
-
-namespace Fission.DotNetCore.Compiler
-{
-    //adapted from this article http://www.tugberkugurlu.com/archive/compiling-c-sharp-code-into-memory-and-executing-it-with-roslyn
-    class FissionCompiler
-    {
-        public static Function Compile(string code, out List<string> errors)
-        {
-            errors = new List<string>();
-
-            SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(code);
-
-            string assemblyName = Path.GetRandomFileName();
-
-            var coreDir = Directory.GetParent(typeof(Enumerable).GetTypeInfo().Assembly.Location);      
-            
-            List<MetadataReference> references = new List<MetadataReference>
-            {
-                MetadataReference.CreateFromFile(coreDir.FullName + Path.DirectorySeparatorChar + "mscorlib.dll"),
-                MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(Assembly.GetEntryAssembly().Location),
-                MetadataReference.CreateFromFile(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer).GetTypeInfo().Assembly.Location)
-            };
-
-            foreach (var referencedAssembly in Assembly.GetEntryAssembly().GetReferencedAssemblies())
-            {
-                var assembly = Assembly.Load(referencedAssembly);
-                references.Add(MetadataReference.CreateFromFile(assembly.Location));
-            }
-
-            CSharpCompilation compilation = CSharpCompilation.Create(
-                assemblyName,
-                syntaxTrees: new[] { syntaxTree },
-                references: references,
-                options: new CSharpCompilationOptions(
-                    OutputKind.DynamicallyLinkedLibrary,
-                    optimizationLevel: OptimizationLevel.Release));
-
-            using (var ms = new MemoryStream())
-            {
-                EmitResult result = compilation.Emit(ms);
-
-                if (!result.Success)
-                {
-                    IEnumerable<Diagnostic> failures = result.Diagnostics.Where(diagnostic =>
-                        diagnostic.IsWarningAsError ||
-                        diagnostic.Severity == DiagnosticSeverity.Error).ToList();
-
-                    foreach (Diagnostic diagnostic in failures)
-                    {
-                        errors.Add($"{diagnostic.Id}: {diagnostic.GetMessage()}");
-                    }
-                }
-                else
-                {
-                    ms.Seek(0, SeekOrigin.Begin);
-
-                    Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(ms);
-                    var type = assembly.GetType("FissionFunction");
-                    var info = type.GetMember("Execute").First() as MethodInfo;
-                    return new Function(assembly, type, info);
-                }
-            }
-            return null;
-        }
-    }
-}
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using Nancy;
-
-namespace Fission.DotNetCore.Api
-{
-    public class FissionContext
-    {
-        public FissionContext(Dictionary<string, object> args, Logger logger, FissionHttpRequest request)
-        {
-            if (args == null) throw new ArgumentNullException(nameof(args));
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-            if (request == null) throw new ArgumentNullException(nameof(request));
-            Arguments = args;
-            Logger = logger;
-            Request = request;
-        }
-
-        public Dictionary<string, object> Arguments { get; private set; }
-
-        public FissionHttpRequest Request { get; private set; }
-
-        public Logger Logger { get; private set; }
-
-        public static FissionContext Build(Request request, Logger logger)
-        {
-            return new FissionContext(((DynamicDictionary)request.Query).ToDictionary(),
-                                        logger,
-                                        new FissionHttpRequest(request));
-        }
-    }
-
-    public class Logger
-    {
-        public void Write(Severity severity, string format, params object[] args)
-        {
-            Console.WriteLine($"{DateTime.Now.ToString("MM/dd/yy H:mm:ss zzz")} {severity}: " + format, args);
-        }
-
-        public void WriteInfo(string format, params object[] args)
-        {
-            Write(Severity.Info, format, args);
-        }
-
-        public void WriteWarning(string format, params object[] args)
-        {
-            Write(Severity.Warning, format, args);
-        }
-
-        public void WriteError(string format, params object[] args)
-        {
-            Write(Severity.Error, format, args);
-        }
-
-        public void WriteCritical(string format, params object[] args)
-        {
-            Write(Severity.Critical, format, args);
-        }
-
-        public void WriteVerbose(string format, params object[] args)
-        {
-            Write(Severity.Verbose, format, args);
-        }
-    }
-
-    public enum Severity
-    {
-        Info,
-        Warning,
-        Error,
-        Critical,
-        Verbose
-    }
-
-    public class FissionHttpRequest
-    {
-        private readonly Request _request;
-        internal FissionHttpRequest(Request request)
-        {
-            if (request == null) throw new ArgumentNullException(nameof(request));
-            _request = request;
-        }
-
-        public Stream Body { get { return _request.Body; } }
-
-        public string BodyAsString()
-        {
-            int length = (int)_request.Body.Length;
-            byte[] data = new byte[length];
-            _request.Body.Read(data, 0, length);
-            return Encoding.UTF8.GetString(data);
-        }
-        
-        public Dictionary<string, IEnumerable<string>> Headers
-        {
-            get
-            {
-                var headers = new Dictionary<string, IEnumerable<string>>();
-                foreach (var kv in _request.Headers)
-                {
-                    headers.Add(kv.Key, kv.Value);
-                }
-                return headers;
-            }
-        }
-
-        public X509Certificate Certificate { get { return _request.ClientCertificate; } }
-        public string Url { get { return _request.Url.ToString(); } }
-        public string Method { get { return _request.Method; } }
-    }
-}
@@ -1,28 +0,0 @@
-using System;
-using System.Reflection;
-using Fission.DotNetCore.Api;
-
-namespace Fission.DotNetCore.Compiler
-{
-    class Function
-    {
-        private readonly Assembly _assembly;
-        private readonly Type _type;
-        private readonly MethodInfo _info;
-
-        public Function(Assembly assembly, Type type, MethodInfo info)
-        {
-            if (info == null) throw new ArgumentNullException(nameof(info));
-            if (assembly == null) throw new ArgumentNullException(nameof(assembly));
-            if (type == null) throw new ArgumentNullException(nameof(type));
-            _assembly = assembly;
-            _type = type;
-            _info = info;
-        }
-
-        public object Invoke(FissionContext context)
-        {
-            return _info.Invoke(_assembly.CreateInstance(_type.FullName), new[] { context });
-        }
-    }
-}
@@ -1,21 +0,0 @@
-using System.IO;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Nancy.Owin;
-
-namespace Fission.DotNetCore
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = new WebHostBuilder()
-               .UseContentRoot(Directory.GetCurrentDirectory())
-               .UseKestrel()
-               .UseUrls("http://*:8888")
-               .Configure(app => app.UseOwin(x => x.UseNancy()))
-               .Build();
-            host.Run();
-        }
-    }
-}
@@ -1,270 +0,0 @@
-# Fission: dotnet C# Environment
-
-This is a simple dotnet C# environment for Fission.
-
-It's a Docker image containing the dotnet 1.1.0 runtime. The image 
-uses Kestrel with Nancy to host the internal web server and uses 
-Roslyn to compile the uploaded code.
-
-The image supports compiling and running code with types defined in
-mscorlib and does not at present support other library references.
-One workaround for this would be to add the references to this project's
-project.json file and rebuild the container.
-
-The environment works via convention where you create a C# class
-called FissionFunction which has a  method named Execute taking a single
-parameter, a FissionContext object.
-
-The FissionContext object gives access to the arguments and other items 
-like logging. Please see FissionContext.cs for public API.
-
-Example of simplest possible class to be executed:
-
-```
-using System;
-using Fission.DotNetCore.Api;
-
-public class FissionFunction {
-    public string Execute(FissionContext context) {
-        return null;
-    }
-}
-```
-
-Please see examples below, or if you are looking for ready-to-run examples, see 
-the [DotNet examples directory](../../examples/dotnet).
-
-## Rebuilding and pushing the image
-
-To rebuild the image you will have to install Docker with version higher than 17.05+
-in order to support multi-stage builds feature.  
-
-### Rebuild containers
-
-Move to the directory containing the source and start the container build process:
-
-```
-docker build -t USER/dotnet-env .
-```
-
-After the build finishes push the new image to a Docker registry using the 
-standard procedure.
-
-## Echo example
-
-### Setup fission environment
-First you need to setup the fission according to your cluster setup as 
-specified here: https://github.com/fission/fission
-
-
-### Create the class to run
-
-Secondly you need to create a file /tmp/func.cs containing the following code:
-
-```
-using System;
-using Fission.DotNetCore.Api;
-
-public class FissionFunction 
-{
-    public string Execute(FissionContext context){
-        context.Logger.WriteInfo("executing.. {0}", context.Arguments["text"]);
-        return (string)context.Arguments["text"];
-    }
-}
-``` 
-### Run the example
-
-Lastly to run the example:
-
-```
-$ fission env create --name dotnet --image fission/dotnet-env
-
-$ fission function create --name echo --env dotnet --code /tmp/func.cs
-
-$ fission route create --method GET --url /echo --function echo
-
-$ curl http://$FISSION_ROUTER/echo?text=hello%20world!
-  hello world
-```
-
-## Addition service example
-
-### Setup fission environment
-First you need to setup the fission according to your cluster setup as 
-specified here: https://github.com/fission/fission
-
-
-### Create the class to run
-
-Secondly you need to create a file /tmp/func.cs containing the following code:
-
-```
-using System;
-using Fission.DotNetCore.Api;
-
-public class FissionFunction 
-{
-    public string Execute(FissionContext context){
-        var x = Convert.ToInt32(context.Arguments["x"]);
-        var y = Convert.ToInt32(context.Arguments["y"]);
-        return (x+y).ToString();
-    }
-}
-``` 
-### Run the example
-
-Lastly to run the example:
-
-```
-$ fission env create --name dotnet --image fission/dotnet-env
-
-$ fission function create --name addition --env dotnet --code /tmp/func.cs
-
-$ fission route create --method GET --url /add --function addition
-
-$ curl "http://$FISSION_ROUTER/add?x=30&y=12"
-  42
-```
-
-## Accessing http request information example
-
-### Setup fission environment
-First you need to setup the fission according to your cluster setup as 
-specified here: https://github.com/fission/fission
-
-
-### Create the class to run
-
-Secondly you need to create a file /tmp/func.cs containing the following code:
-
-```
-using System;
-using Fission.DotNetCore.Api;
-
-public class FissionFunction
-{
-    public string Execute(FissionContext context){
-        var buffer = new System.Text.StringBuilder();
-        foreach(var header in context.Request.Headers){
-                buffer.AppendLine(header.Key);
-                foreach(var item in header.Value){
-                        buffer.AppendLine($"\t{item}");
-                }
-        }
-        buffer.AppendLine($"Url: {context.Request.Url}, method: {context.Request.Method}");
-        return buffer.ToString();
-    }
-}
-
-``` 
-### Run the example
-
-Lastly to run the example:
-
-```
-$ fission env create --name dotnet --image fission/dotnet-env
-
-$ fission function create --name httpinfo --env dotnet --code /tmp/func.cs
-
-$ fission route create --method GET --url /http_info --function httpinfo
-
-$ curl "http://$FISSION_ROUTER/http_info"
-Accept
-	*/*;q=1
-Host
-	fissionserver:8888
-User-Agent
-	curl/7.47.0
-Url: http://fissionserver:8888, method: GET
-
-```
-
-## Accessing http request body example
-
-### Setup fission environment
-First you need to setup the fission according to your cluster setup as 
-specified here: https://github.com/fission/fission
-
-
-### Create the class to run
-
-Secondly you need to create a file /tmp/func.cs containing the following code:
-
-```
-using System.IO;
-using System.Runtime.Serialization.Json;
-using Fission.DotNetCore.Api;
-
-public class FissionFunction
-{
-    public string Execute(FissionContext context)
-    {
-        var person = Person.Deserialize(context.Request.Body);
-        return $"Hello, my name is {person.Name} and I am {person.Age} years old.";
-    }
-}
-
-public class Person
-{
-    public string Name { get; set; }
-    public int Age { get; set; }
-
-    public static Person Deserialize(Stream json)
-    {
-        var serializer = new DataContractJsonSerializer(typeof(Person));
-        return (Person)serializer.ReadObject(json);
-    }
-}
-
-``` 
-### Run the example
-
-Lastly to run the example:
-
-```
-$ fission env create --name dotnet --image fission/dotnet-env
-
-$ fission function create --name httpbody --env dotnet --code /tmp/func.cs
-
-$ fission route create --method GET --url /http_body --function httpbody
-
-$ curl -XPOST "http://$FISSION_ROUTER/http_body" -d '{ "Name":"Arthur", "Age":42}'
-Hello, my name is Arthur and I am 42 years old.
-
-```
-
-
-## Developing/debugging the enviroment locally
-
-The easiest way to debug the environment is to open the directory in
-Visual Studio Code (VSCode) as that will setup debugger for you the
-first time.
-
-Remember to install the excellent extension 
-"C# for Visual Studio Code(powered by OmniSharp)" to get statement completion
-
-The class ExecutorModule contain preprocessor directive overriding where 
-the input code file should be found:
-
-```
-#if DEBUG
-        private const string CODE_PATH = "/tmp/func.cs";
-#else
-        private const string CODE_PATH = "/userfunc/user";
-#endif
-```
-
-So what you need to do is:
-1. Open the directory in VSCode. 
-This will prompt restore of packages and query is debugger setup is needed. Accept both prompts.
-2. Press F5 to start the web server. Set breakpoints etc..
-3. Add a code file containing valid C# at /tmp/func.cs 
-4. Specialize the service with curl via post
-```
-$ curl -XPOST http://localhost:8888/specialize
-```
-5. Call your function with curl
-```
-$ curl -XGET http://localhost:8888
-``` 
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <AssemblyName>fission-dotnet</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>dotnet</PackageId>
-    <PackageTargetFallback>$(PackageTargetFallback);netstandard1.3</PackageTargetFallback>
-    <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.0.2" />
-    <PackageReference Include="Nancy" Version="2.0.0-barneyrubble" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0-*" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.0.0-*" />
-    <PackageReference Include="System.Runtime.Serialization.Json" Version="4.0.2" />
-  </ItemGroup>
-
-</Project>
@@ -1,3 +0,0 @@
-#!/bin/sh
-dotnet restore fission-dotnet.csproj
-dotnet publish fission-dotnet.csproj -c Release -o out
@@ -1 +0,0 @@
-builder
@@ -1,15 +0,0 @@
-FROM microsoft/dotnet:2.0.0-sdk AS builder
-
-COPY * /proj/
-RUN cd /proj && ./project-build.sh
-
-# Build env image
-FROM microsoft/dotnet:2.0-runtime
-
-WORKDIR /fission-workdir
-COPY --from=builder /proj/out .
-EXPOSE 8888
-
-ENTRYPOINT ["dotnet"]
-
-CMD ["fission-dotnet20.dll"]
@@ -1,179 +0,0 @@
-using Fission.DotNetCore.Compiler;
-using Fission.DotNetCore.Api;
-using System.Collections.Generic;
-using Nancy;
-using System.IO;
-using System;
-using Nancy.IO;
-using Fission.DotNetCore.Utilty;
-using Fission.DotNetCore.Model;
-using Nancy.Extensions;
-
-namespace Fission.DotNetCore
-{
-    public class ExecutorModule : NancyModule
-    {
-        private static string PackagePath = string.Empty;
-#if DEBUG
-        private const string CODE_PATH = "/tmp/func.cs";
-#else
-        private const string CODE_PATH = "/userfunc/user";
-#endif
-        private static Function _userFunc;
-        private static Logger _logger = new Logger();
-
-        public ExecutorModule()
-        {
-            Post("/specialize", args => Specialize());
-            Post("/v2/specialize", args => Specializev2());
-            Get("/", _ => Run());
-            Post("/", _ => Run());
-            Put("/", _ => Run());
-            Head("/", _ => Run());
-            Options("/", _ => Run());
-            Delete("/", _ => Run());
-        }
-
-        private object Specializev2()
-        {
-            Console.WriteLine("Call Reached at  /v2/specialize");
-
-            try
-            {
-                var errors = new List<string>();
-                var oinfo = new List<string>();
-                var _request = Request;
-                var _body = Request.Body;
-                // Request.Body.Position = 0; use it only if requst has already been read before that
-                var _requestBodystring = RequestStream.FromStream(Request.Body).AsString();
-                Console.WriteLine($"Request received by endpoint from builder : {_requestBodystring}");
-                BuilderRequest builderRequest = EnvironmentHelper.Instance.GetBuilderRequest(_requestBodystring);
-                if (builderRequest == null)
-                {
-                    Console.WriteLine("Error : Unbale to parse builder request!!");
-                    throw new Exception("Error : Unbale to parse builder request!!");
-                }
-
-                string functionPath = string.Empty;
-                // functionPath = Path.Combine(builderRequest.filepath, $"{builderRequest.functionName}.cs");
-
-                PackagePath = builderRequest.filepath;
-                //following will enable us to skip --entrypoint flag during function creation 
-                if (!string.IsNullOrWhiteSpace(builderRequest.functionName))
-                {
-                    functionPath = Path.Combine(builderRequest.filepath, $"{builderRequest.functionName}.cs");
-                }
-                else
-                {
-                    functionPath = Path.Combine(builderRequest.filepath, EnvironmentHelper.Instance.environmentSettings.functionBodyFileName);
-                }
-
-                Console.WriteLine($"Going to read function body from path : {functionPath}");
-
-                if (File.Exists(functionPath))
-                {
-                    var code = File.ReadAllText(functionPath);
-                    try
-                    {
-                        FissionCompiler fissionCompiler = new FissionCompiler(builderRequest.filepath);
-                        _userFunc = fissionCompiler.Compilev2(code, out errors, out oinfo);
-                    }
-                    catch (Exception ex)
-                    {
-                        Console.WriteLine($"Error getting _userFunc :{ex.Message} , Trace : {ex.StackTrace}");
-                    }
-                    if (_userFunc == null)
-                    {
-                        var errstr = string.Join(Environment.NewLine, errors);
-                        _logger.WriteError(errstr);
-                        Console.WriteLine($"Error  _userFunc is null :{errstr}");
-                        var response = (Response)errstr;
-                        response.StatusCode = HttpStatusCode.InternalServerError;
-                        return response;
-
-                    }
-                    else
-                    {
-                        //try to retrun few details 
-                        var infostr = string.Join(Environment.NewLine, oinfo);
-                        _logger.WriteInfo(infostr);
-                        var response = (Response)infostr;
-                        response.StatusCode = HttpStatusCode.OK;
-                        return response;
-                    }
-                }
-                else
-                {
-                    var errstr = $"Unable to locate code at '{functionPath}'";
-                    _logger.WriteError(errstr);
-                    var response = (Response)errstr;
-                    response.StatusCode = HttpStatusCode.InternalServerError;
-                    return response;
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Exception occured {ex.Message} | {ex.StackTrace}");
-                var errstr = $"Exception occured {ex.Message} | {ex.StackTrace}";
-                _logger.WriteError(errstr);
-                var response = (Response)errstr;
-                response.StatusCode = HttpStatusCode.InternalServerError;
-                return response;
-            }
-        }
-
-        private object Specialize()
-        {
-            var errors = new List<string>();
-            if (File.Exists(CODE_PATH))
-            {
-                var code = File.ReadAllText(CODE_PATH);
-                _userFunc = FissionCompiler.Compile(code, out errors);
-                if (_userFunc == null)
-                {
-                    var errstr = string.Join(Environment.NewLine, errors);
-                    _logger.WriteError(errstr);
-                    var response = (Response)errstr;
-                    response.StatusCode = HttpStatusCode.InternalServerError;
-                    return response;
-
-                }
-                return null;
-            }
-            else
-            {
-                var errstr = $"Unable to locate code at '{CODE_PATH}'";
-                _logger.WriteError(errstr);
-                var response = (Response)errstr;
-                response.StatusCode = HttpStatusCode.InternalServerError;
-                return response;
-            }
-        }
-
-        private object Run()
-        {
-            if (_userFunc == null)
-            {
-                var response = (Response)"Generic container: no requests supported";
-                response.StatusCode = HttpStatusCode.InternalServerError;
-                return response;
-            }
-            
-            try
-            {
-                var context = FissionContext.Build(Request, new Logger());
-                //set the package path ,as that will be required to get appsetting files from package
-                context.PackagePath = PackagePath;
-                return _userFunc.Invoke(context);
-            }
-            catch (Exception e)
-            {
-                _logger.WriteError(e.ToString());
-                var response = (Response)e.Message;
-                response.StatusCode = HttpStatusCode.BadRequest;
-                return response;
-            }
-        }
-    }
-}
-
@@ -1,230 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-using Fission.DotNetCore.Model;
-using Fission.DotNetCore.Utilty;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Emit;
-
-namespace Fission.DotNetCore.Compiler
-{
-    //adapted from this article http://www.tugberkugurlu.com/archive/compiling-c-sharp-code-into-memory-and-executing-it-with-roslyn
-    class FissionCompiler
-    {
-        string packagepath = string.Empty;
-        FunctionSpecification functionSpecification = null;
-        public FissionCompiler(string _packagePath)
-        {
-            this.packagepath = _packagePath;
-        }
-        public static Function Compile(string code, out List<string> errors)
-        {
-            errors = new List<string>();
-
-            SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(code);
-
-            string assemblyName = Path.GetRandomFileName();
-
-            var coreDir = Directory.GetParent(typeof(Enumerable).GetTypeInfo().Assembly.Location);      
-            
-            List<MetadataReference> references = new List<MetadataReference>
-            {
-                MetadataReference.CreateFromFile(coreDir.FullName + Path.DirectorySeparatorChar + "mscorlib.dll"),
-                MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(Assembly.GetEntryAssembly().Location),
-                MetadataReference.CreateFromFile(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer).GetTypeInfo().Assembly.Location)
-            };
-
-            foreach (var referencedAssembly in Assembly.GetEntryAssembly().GetReferencedAssemblies())
-            {
-                var assembly = Assembly.Load(referencedAssembly);
-                references.Add(MetadataReference.CreateFromFile(assembly.Location));
-            }
-
-            CSharpCompilation compilation = CSharpCompilation.Create(
-                assemblyName,
-                syntaxTrees: new[] { syntaxTree },
-                references: references,
-                options: new CSharpCompilationOptions(
-                    OutputKind.DynamicallyLinkedLibrary,
-                    optimizationLevel: OptimizationLevel.Release));
-
-            using (var ms = new MemoryStream())
-            {
-                EmitResult result = compilation.Emit(ms);
-
-                if (!result.Success)
-                {
-                    IEnumerable<Diagnostic> failures = result.Diagnostics.Where(diagnostic =>
-                        diagnostic.IsWarningAsError ||
-                        diagnostic.Severity == DiagnosticSeverity.Error).ToList();
-
-                    foreach (Diagnostic diagnostic in failures)
-                    {
-                        errors.Add($"{diagnostic.Id}: {diagnostic.GetMessage()}");
-                    }
-                }
-                else
-                {
-                    ms.Seek(0, SeekOrigin.Begin);
-
-                    Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(ms);
-                    //support for Namespace , as well as backward compatibility for existing functions
-                    var type = assembly.GetTypes().FirstOrDefault(x => x.Name.EndsWith("FissionFunction"));
-                    var info = type.GetMember("Execute").First() as MethodInfo;
-                    return new Function(assembly, type, info);
-                }
-            }
-            return null;
-        }
-
-        public Function Compilev2(string code, out List<string> errors, out List<string>  oinfo)
-        {
-            errors = new List<string>();
-            oinfo = new List<string>();
-
-            #region syntext tree and default refrence build
-            SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(code);
-
-            string assemblyName = Path.GetRandomFileName();
-
-            var coreDir = Directory.GetParent(typeof(Enumerable).GetTypeInfo().Assembly.Location);
-
-            Console.WriteLine("Adding core refrences !!");
-            List<MetadataReference> references = new List<MetadataReference>
-            {
-                MetadataReference.CreateFromFile(coreDir.FullName + Path.DirectorySeparatorChar + "mscorlib.dll"),
-                MetadataReference.CreateFromFile(coreDir.FullName + Path.DirectorySeparatorChar + "netstandard.dll"),
-                MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(Assembly.GetEntryAssembly().Location),
-                MetadataReference.CreateFromFile(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer).GetTypeInfo().Assembly.Location)
-            };
-
-            Console.WriteLine("Adding parent assembaly based refrences !!");
-            foreach (var referencedAssembly in Assembly.GetEntryAssembly().GetReferencedAssemblies())
-            {
-                var assembly = Assembly.Load(referencedAssembly);
-                references.Add(MetadataReference.CreateFromFile(assembly.Location));
-               
-            }
-
-
-
-            #endregion
-
-            #region load function specs based dlls
-
-            Console.WriteLine($"going to get function specification...");
-            //load all available dlls from  deployment folder in dllinfo object
-            functionSpecification = EnvironmentHelper.Instance.GetFunctionSpecs(packagepath);
-
-            Console.WriteLine($"going to get package dlls...");
-            //iterate and all all libraries mentioned 
-            foreach (var library in functionSpecification.libraries)
-            {
-                string dllCompletePath = Path.Combine(packagepath, library.path).GetrelevantPathAsPerOS();
-                references.Add(MetadataReference.CreateFromFile(dllCompletePath));
-                Console.WriteLine($"refered folder based dll : {dllCompletePath} from package {library.nugetPackage}");
-            }
-            Console.WriteLine($"refered all available dlls!!");
-            oinfo.Add("refered all available dlls!!");
-
-            #endregion 
-
-            #region dynamic resolve handeler registration 
-            AppDomain currentDomain = AppDomain.CurrentDomain;
-            currentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
-
-            #endregion
-
-            #region function compile
-
-            Console.WriteLine($"Trying to Compile");
-            CSharpCompilation compilation = CSharpCompilation.Create(
-                assemblyName,
-                syntaxTrees: new[] { syntaxTree },
-                references: references,
-                options: new CSharpCompilationOptions(
-                    OutputKind.DynamicallyLinkedLibrary,
-                    optimizationLevel: OptimizationLevel.Release));
-
-            using (var ms = new MemoryStream())
-            {
-                EmitResult result = compilation.Emit(ms);
-
-                if (!result.Success)
-                {
-                    Console.WriteLine($"Compile Failed , see pod logs for more details");
-                    IEnumerable<Diagnostic> failures = result.Diagnostics.Where(diagnostic =>
-                        diagnostic.IsWarningAsError ||
-                        diagnostic.Severity == DiagnosticSeverity.Error).ToList();
-
-                    foreach (Diagnostic diagnostic in failures)
-                    {
-                        errors.Add($"{diagnostic.Id}: {diagnostic.GetMessage()}");
-                        Console.WriteLine($"COMPILE ERROR :{diagnostic.Id}: {diagnostic.GetMessage()}", "ERROR");
-                    }
-                }
-                else
-                {
-                    oinfo.Add("COMPILE SUCCESS!!");
-                    Console.WriteLine($"COMPILE SUCCESS!!");
-
-                    ms.Seek(0, SeekOrigin.Begin);
-
-                    Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(ms);
-                    //var type = assembly.GetType("FissionFunction");
-                    //support for Namespace , as well as backward compatibility for existing functions
-                    var type = assembly.GetTypes().FirstOrDefault(x => x.Name.EndsWith("FissionFunction"));
-                    //assembly.GetTypes().Where(x=>x.Name.ToLower().EndsWith("FissionFunction".ToLower())).FirstOrDefault();
-                    var info = type.GetMember("Execute").First() as MethodInfo;
-                    return new Function(assembly, type, info);
-                }
-            }
-            return null;
-
-            #endregion
-
-
-
-        }
-
-        private Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            //This handler is called only when the common language runtime tries to bind to the assembly and fails.
-
-            Console.WriteLine($"Dynamically trying to load dll {(args.Name.Substring(0, args.Name.IndexOf(",")).ToString() + ".dll").ToLower()} in parent assembaly");
-
-            //Retrieve the list of referenced assemblies in an array of AssemblyName.
-            Assembly MyAssembly = null, objExecutingAssemblies;
-            string strTempAssmbPath_relative = "", strTempAssmbPath_absolute = "";
-
-            objExecutingAssemblies = Assembly.GetExecutingAssembly();
-            AssemblyName[] arrReferencedAssmbNames = objExecutingAssemblies.GetReferencedAssemblies();
-
-            ////Loop through the array of referenced assembly names.
-
-            //load all available dlls from  deployment folder in dllinfo object         
-            if (functionSpecification.libraries.Any(x => x.name.ToLower() == (args.Name.Substring(0, args.Name.IndexOf(",")).ToString() + ".dll").ToLower()))
-            {
-                strTempAssmbPath_relative = functionSpecification.libraries.Where(x => x.name.ToLower() == (args.Name.Substring(0, args.Name.IndexOf(",")).ToString() + ".dll").ToLower()).FirstOrDefault().path;
-                strTempAssmbPath_absolute = Path.Combine(packagepath, strTempAssmbPath_relative);
-                Console.WriteLine($"loading dll in parent assembaly :{strTempAssmbPath_absolute.GetrelevantPathAsPerOS()}");
-                //Load the assembly from the specified path. 
-                MyAssembly = Assembly.LoadFile(strTempAssmbPath_absolute.GetrelevantPathAsPerOS());
-                Console.WriteLine($"Load success for :{strTempAssmbPath_absolute.GetrelevantPathAsPerOS()}");
-            }
-
-            if (MyAssembly == null)
-            {
-                Console.WriteLine($"WARNING !!! unabel to locate dll  :{(args.Name.Substring(0, args.Name.IndexOf(",")).ToString() + ".dll").ToLower()} ", "WARNING");
-            }
-            //Return the loaded assembly.
-            return MyAssembly;
-        }
-    }
-}
@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using Nancy;
-using Newtonsoft.Json;
-
-
-namespace Fission.DotNetCore.Api
-{
-    public class FissionContext
-    {
-        public string PackagePath { get; set; }
-        public FissionContext(Dictionary<string, object> args, Logger logger, FissionHttpRequest request)
-        {
-            if (args == null) throw new ArgumentNullException(nameof(args));
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-            if (request == null) throw new ArgumentNullException(nameof(request));
-            Arguments = args;
-            Logger = logger;
-            Request = request;
-        }
-
-        public Dictionary<string, object> Arguments { get; private set; }
-
-        public FissionHttpRequest Request { get; private set; }
-
-        public Logger Logger { get; private set; }
-
-        public static FissionContext Build(Request request, Logger logger)
-        {
-            return new FissionContext(((DynamicDictionary)request.Query).ToDictionary(),
-                                        logger,
-                                        new FissionHttpRequest(request));
-        }
-        //this is to support aditional setting file read from source/deployment package via function
-        public T GetSettings<T>(string relativePath)
-        {
-            var filePath = Path.Combine(this.PackagePath, relativePath);
-            Console.WriteLine($"Going to Get Setting from :{filePath}");
-            string json = GetSettingsJson(filePath);
-            return JsonConvert.DeserializeObject<T>(json);
-        }
-
-        private string GetSettingsJson(string relativePath)
-        {
-            return File.ReadAllText(Path.Combine(this.PackagePath, relativePath));
-        }
-
-    }
-
-    public class Logger
-    {
-        public void Write(Severity severity, string format, params object[] args)
-        {
-            Console.WriteLine($"{DateTime.Now.ToString("MM/dd/yy H:mm:ss zzz")} {severity}: " + format, args);
-        }
-
-        public void WriteInfo(string format, params object[] args)
-        {
-            Write(Severity.Info, format, args);
-        }
-
-        public void WriteWarning(string format, params object[] args)
-        {
-            Write(Severity.Warning, format, args);
-        }
-
-        public void WriteError(string format, params object[] args)
-        {
-            Write(Severity.Error, format, args);
-        }
-
-        public void WriteCritical(string format, params object[] args)
-        {
-            Write(Severity.Critical, format, args);
-        }
-
-        public void WriteVerbose(string format, params object[] args)
-        {
-            Write(Severity.Verbose, format, args);
-        }
-    }
-
-    public enum Severity
-    {
-        Info,
-        Warning,
-        Error,
-        Critical,
-        Verbose
-    }
-
-    public class FissionHttpRequest
-    {
-        private readonly Request _request;
-        internal FissionHttpRequest(Request request)
-        {
-            if (request == null) throw new ArgumentNullException(nameof(request));
-            _request = request;
-        }
-
-        public Stream Body { get { return _request.Body; } }
-
-        public string BodyAsString()
-        {
-            int length = (int)_request.Body.Length;
-            byte[] data = new byte[length];
-            _request.Body.Read(data, 0, length);
-            return Encoding.UTF8.GetString(data);
-        }
-        
-        public Dictionary<string, IEnumerable<string>> Headers
-        {
-            get
-            {
-                var headers = new Dictionary<string, IEnumerable<string>>();
-                foreach (var kv in _request.Headers)
-                {
-                    headers.Add(kv.Key, kv.Value);
-                }
-                return headers;
-            }
-        }
-
-        public X509Certificate Certificate { get { return _request.ClientCertificate; } }
-        public string Url { get { return _request.Url.ToString(); } }
-        public string Method { get { return _request.Method; } }
-    }
-}
--- a/Show More
+++ b/Show More