Merge upstream, also add 4.1.0 version & change log

.cfignore

@@ -22,4 +22,4 @@ docs/
 build/dev_config.json
 e2e-reports/
 website/
-.helm-cache/
+.helm-cache/

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Change Log
 
+## 4.1.0
+
+[Full Changelog](https://github.com/SUSE/stratos/compare/4.0.1...4.1.0)
+
+This release contains a number of fixes and improvements:
+
+**Improvements:**
+
+- Helm: Add support for JSON Schema when inputting values [\#447](https://github.com/SUSE/stratos/issues/447)
+- Helm: Improve chart values YAML editor [\#481](https://github.com/SUSE/stratos/issues/481)
+- Helm: Support helm upgrade of a workload [\#446](https://github.com/SUSE/stratos/issues/446)
+- Helm: Allow users to view and use repositories from Helm Hub [\#445](https://github.com/SUSE/stratos/issues/445)
+- Add support for API Keys [\#4504](https://github.com/cloudfoundry/stratos/issues/4504)
+- Workload List: Show Chart Version instead of Release Version [\#473](https://github.com/SUSE/stratos/issues/473)
+- Helm: Allow users to view revision history for a Helm Release [\#460](https://github.com/SUSE/stratos/issues/460)
+- Kubernetes Terminal: It can take a long time to get to the prompt with large helm repositories registered [\#452](https://github.com/SUSE/stratos/issues/452)
+- Show CaaSP Node version and whether updates are pending on the summary view [\#450](https://github.com/SUSE/stratos/issues/450)
+- Update SUSE login screen to latest EOS design [\#448](https://github.com/SUSE/stratos/issues/448)
+- Toggle live updates in workloads view [\#442](https://github.com/SUSE/stratos/issues/442)
+- Container List in Pods List Improvements [\#360](https://github.com/SUSE/stratos/issues/360)
+- Register Endpoint: Reduce size of cards [\#4568](https://github.com/cloudfoundry/stratos/issues/4568)
+- Metrics view: Add "The last day" to time range selector  [\#4516](https://github.com/cloudfoundry/stratos/issues/4516)
+
+
+**Fixes:**
+
+- Helm Install: Install button becomes enabled before namespace supplied [\#471](https://github.com/SUSE/stratos/issues/471)
+- Helm Chart: Charts view incorrectly shows development versions as the latest versions [\#455](https://github.com/SUSE/stratos/issues/455)
+- Sort endpoint table by type results in empty sort drop down in cf endpoints list [\#4565](https://github.com/cloudfoundry/stratos/issues/4565)
+- Endpoint unregister clears user sort & filter selection [\#4563](https://github.com/cloudfoundry/stratos/issues/4563)
+- Metrics: Metrics detail page can show two endpoint cards if URLs have trailing slash [\#4528](https://github.com/cloudfoundry/stratos/issues/4528)
+- Deploy from Gitlab: Repos in groups do not work [\#4153](https://github.com/cloudfoundry/stratos/issues/4153)
+- Deploy app from Github repo only shows branches from a-e in dropdown [\#3966](https://github.com/cloudfoundry/stratos/issues/3966)
+
+
 ## 4.0.1
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/4.0.0...4.0.1)

deploy/ci/console-nightly-releases.yml

@@ -106,25 +106,25 @@ jobs:
           dockerfile: stratos/deploy/Dockerfile.bk
           build: stratos/
           target_name:  prod-build
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
           build_args_file: image-tag/build-args
       - put: mariadb-image
         params:
           dockerfile: stratos/deploy/db/Dockerfile.mariadb
           build: stratos/deploy/db
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
     - do:
       - put: config-init-image
         params:
           dockerfile: stratos/deploy/Dockerfile.init
           build: stratos/
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
       - put: ui-image
         params:
           dockerfile: stratos/deploy/Dockerfile.ui
           build: stratos/
           target_name: prod-build
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
           prebuild_script: build/store-git-metadata.sh
 - name: create-chart
   plan:
@@ -153,7 +153,7 @@ jobs:
     - put: nightly-gh-release
       params:
         name: stratos/deploy/ci/tasks/dev-releases/nightly-release-name
-        tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+        tag: stratos/deploy/ci/tasks/build-images/nightly-tag
         body: stratos/deploy/ci/tasks/dev-releases/nightly-release-description
         globs:
         - helm-chart-tarball/*.tgz

deploy/ci/tasks/dev-releases/nightly-release-description

@@ -1 +1 @@
-This is an alpha release of Stratos v2
+Nightly Stratos build

deploy/ci/tasks/dev-releases/nightly-release-name

@@ -1 +1 @@
-Stratos 3.0.0 Nightly Release
+Stratos Nightly Release

deploy/kubernetes/build.sh

@@ -296,5 +296,5 @@ printf "${RESET}"
 echo
 echo "To deploy using Helm, execute the following:"
 echo 
-echo "    helm install helm-chart --namespace console --name my-console"
+echo "    helm install my-console ./helm-chart --namespace console"
 echo

deploy/kubernetes/console/Chart.yaml

@@ -1,8 +1,17 @@
 apiVersion: v1
-description: A Helm chart for deploying Stratos UI Console
+description: A Helm chart for deploying Stratos
 name: console
 version: 0.1.0
 appVersion: 0.1.0
 sources:
   - https://github.com/cloudfoundry/stratos
-icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png
+icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png
+home: https://stratos.app
+maintainers:
+  - name: Stratos Maintainers
+    email: stratos-maintainers@suse.de
+keywords:
+  - Stratos
+  - "Cloud Foundry"
+  - Kubernetes
+  - Helm

deploy/kubernetes/console/README.md

@@ -22,7 +22,7 @@ Check the repository was successfully added by searching for the `console`, for
 ```
 helm search repo console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	4.0.1           4.0.1      	A Helm chart for deploying Stratos UI Console
+stratos/console    	4.1.0           4.1.0      	A Helm chart for deploying Stratos UI Console
 ```
 
 > Note: Version numbers will depend on the version of Stratos available from the Helm repository

deploy/kubernetes/console/templates/NOTES.txt

@@ -0,0 +1,31 @@
+{{- if .Values.console.techPreview }}
+Tech Preview is enabled, extra features will be shown.
+{{- end}}
+
+To access Stratos:
+{{- $ingress := .Values.console.ingress | default dict }}
+{{- if $ingress.enabled }}
+From outside the cluster, the server URL is: http://{{ .Values.console.ingress.host }}
+{{- else }}
+Get the URL by running these commands in the same shell:
+{{- if contains "NodePort" .Values.console.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services console-ui-ext)
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo https://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.console.service.type }}
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w console-ui-ext'
+
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} console-ui-ext -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.console.service.servicePort }}
+{{- else if contains "ClusterIP"  .Values.console.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app=stratos-0,component=ui" -o jsonpath="{.items[0].metadata.name}")
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 443
+{{- end }}
+{{- end }}
+
+To learn more about the release, try:
+  $ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
+  $ helm get values {{ .Release.Name }} -n {{ .Release.Namespace }}
+  $ kubectl get services -n {{ .Release.Namespace }}
+  $ kubectl get pods -n {{ .Release.Namespace }}