Merge remote-tracking branch 'origin/master' into create-kube-package

SUSE · nwmac · Oct 2, 2020 · Jul 28, 2020 · Aug 7, 2020 · Aug 7, 2020
commit fdf653816df80446ebf0d28b97a50e566c339c23
diff --git a/.cfignore b/.cfignore
@@ -22,3 +22,4 @@ docs/
 build/dev_config.json
 e2e-reports/
 website/
+.helm-cache/
diff --git a/.gitignore b/.gitignore
@@ -96,6 +96,7 @@ src/jetstream/config.properties
 src/jetstream/db/dbconf.yml
 src/jetstream/plugins/monocular/chart-repo/chartrepo
 src/jetstream/plugins/analysis/container/analyzers
+src/jetstream/.helm-cache
 
 # Customisations - these can be removed in the future
 # Left in for now to prevent these files being checked-in, if they are still present

diff --git a/CHANGELOG.md b/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)

diff --git a/angular.json b/angular.json
@@ -28,7 +28,17 @@
                 "input": "custom-src/frontend/assets/custom",
                 "output": "/core/assets/custom"
               },
-              "src/frontend/packages/core/favicon.ico"
+              "src/frontend/packages/core/favicon.ico",
+              {
+                "glob": "**/*",
+                "input": "node_modules/ngx-monaco-editor/assets/monaco",
+                "output": "/core/assets/monaco"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@cfstratos/monaco-yaml/lib",
+                "output": "/core/assets/monaco/vs/language/yaml"
+              }
             ],
             "styles": [
               "src/frontend/packages/core/src/styles.scss",

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
@@ -16,65 +16,6 @@ RUN deploy/all-in-one/src-build.sh
 # Generate dev-certs
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh
 
-# ---------------------------------------------------------------------------------------------------
-# Docker build for FDB Server component
-FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
-
-# Install FoundationDB Binaries
-ARG FDB_VERSION=6.2.15
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-USER root
-WORKDIR /home/stratos/tmp
-WORKDIR /home/stratos
-RUN pwd && ls -al
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz -o fdb_$FDB_VERSION.tar.gz && \
-	tar -xzf fdb_$FDB_VERSION.tar.gz --strip-components=1 && \
-	rm fdb_$FDB_VERSION.tar.gz && \
-	chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
-	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /usr/bin
-
-WORKDIR /var/fdb
-
-# Install FoundationDB Client Libraries
-
-ARG FDB_VERSION=6.2.15
-ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-COPY deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash scripts/
-
-# Set Up Runtime Scripts and Directories
-COPY deploy/containers/monocular/fdb-server/fdb.bash scripts/
-COPY deploy/containers/monocular/fdb-server/create_server_environment.bash scripts/
-COPY deploy/containers/monocular/fdb-server/create_cluster_file.bash scripts/
-COPY deploy/containers/monocular/fdb-server/configure_db.bash scripts/
-RUN chmod u+x scripts/*.bash && \
-	mkdir -p logs
-
-# ---------------------------------------------------------------------------------------------------
-# Docker build for FDB Document Layer component
-FROM splatform/stratos-bk-build-base:leap15_1 as fdbdoclayer-builder
-
-# Install FoundationDB Document Layer Binaries
-ARG FDB_DOC_VERSION=1.6.3
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-WORKDIR /home/stratos
-RUN curl $FDB_WEBSITE/downloads/$FDB_DOC_VERSION/linux/fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz -o fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
-    tar -xvf fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
-    mv fdb-document-layer-$FDB_DOC_VERSION-Linux doclayer
-
-# ---------------------------------------------------------------------------------------------------
-# Docker build for Chart Repo component
-FROM splatform/stratos-bk-build-base:leap15_1 as chartrepo-builder
-
-COPY --chown=stratos:users src/jetstream/plugins/monocular/chart-repo /go/src/github.com/helm/monocular
-WORKDIR /go/src/github.com/helm/monocular
-ARG VERSION
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
-
-
 # ---------------------------------------------------------------------------------------------------
 # Final AIO Container
 # ---------------------------------------------------------------------------------------------------
@@ -92,59 +33,15 @@ COPY --from=jetstream-builder /home/stratos/config.properties /srv/config.proper
 # User Invite templates
 COPY --from=jetstream-builder /home/stratos/src/jetstream/templates /srv/templates
 
-# Pull in binaries from fdbserver-builder
-COPY --from=fdbserver-builder /usr/bin /usr/bin
-COPY --from=fdbserver-builder /var/fdb/scripts /var/fdb/scripts
-
-# Install FoundationDB Client Libraries directly here rather than in the fdbserver-builder, as the install destination depends on an external script.
-ARG FDB_VERSION=6.2.15
-ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
-ARG FDB_WEBSITE=https://www.foundationdb.org
-RUN mkdir -p /mnt/website
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib64/libfdb_c.so && \
-	bash /var/fdb/scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
-	rm -rf /mnt/website
-VOLUME /var/fdb/data
-RUN mkdir -p /var/fdb/logs
-
-# Pull in binaries from fdbdoclayer-builder
-COPY --from=fdbdoclayer-builder /home/stratos/doclayer/bin/fdbdoc /usr/bin/fdbdoc
-COPY --from=fdbdoclayer-builder /home/stratos/doclayer/lib/foundationdb/document/fdbmonitor /usr/bin/fdbmonitor
-# Bring in doclayer startup script
-COPY deploy/containers/monocular/fdb-doclayer/fdbdoc.bash /var/fdb/scripts
-RUN chmod u+x /var/fdb/scripts/fdbdoc.bash
-# Doclayer startup script dependency
-# FoundationDB environment variables
-ENV FDB_PORT 4500
-ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
-# Set to host, since all processes run in single container
-ENV FDB_NETWORKING_MODE host 
-ENV FDB_COORDINATOR_PORT 4500
-ENV FDB_PROCESS_CLASS unset
-ENV CLUSTER_ID docker:docker
-ENV FDB_COORDINATOR localhost
-ENV FDB_DOC_PORT 27016
-ENV FDB_LISTEN_IP 0.0.0.0
-
-# Pull in binaries from chartrepo-builder
-COPY --from=chartrepo-builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
-
 # Enable persistence features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nFORCE_ENABLE_PERSISTENCE_FEATURES=true\n" >> /srv/config.properties ; fi
 
 # Enable tech preview features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nENABLE_TECH_PREVIEW=true\n" >> /srv/config.properties ; fi
 
-# Fix dig to resolve localhost to 127.0.0.1
-RUN mv /usr/bin/dig /usr/bin/digit
-COPY deploy/all-in-one/dig.sh /usr/bin/dig
-RUN chmod +x /usr/bin/dig
-
 EXPOSE 443
 
 # Need to be root to bind to port 443
 USER root
 
-COPY deploy/aio-entrypoint.sh .
-RUN chmod +x ./aio-entrypoint.sh
-ENTRYPOINT ["bash", "-c", "./aio-entrypoint.sh -u mongodb://localhost:${FDB_DOC_PORT}"]
+ENTRYPOINT ["./jetstream"]
diff --git a/deploy/aio-entrypoint.sh b/deploy/aio-entrypoint.sh
diff --git a/deploy/all-in-one/config.all-in-one.properties b/deploy/all-in-one/config.all-in-one.properties
@@ -14,5 +14,4 @@ STRATOS_DEPLOYMENT_DOCKER_AIO=true
 SKIP_SSL_VALIDATION=true
 SQLITE_KEEP_DB=true
 TEMPLATE_DIR=./templates
-FDB_URL=mongodb://localhost:27016
-SYNC_SERVER_URL=http://localhost:8080
+HELM_CACHE_FOLDER=./helm-cache
diff --git a/deploy/all-in-one/dig.sh b/deploy/all-in-one/dig.sh
diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
@@ -13,8 +13,8 @@ resources:
     uri: git@github.com:((stratos-repository-organization))/((stratos-repository))
     branch: ((stratos-repository-branch))
     private_key: ((github-private-key))
-    # Match any Version 3 release (alpha, beta, rc) other than the actual release
-    tag_filter: "3*-*"
+    # Match any Version 4 release (alpha, beta, rc) other than the actual release
+    tag_filter: "4*-*"
 - name: helm-repo
   type: git
   source:

diff --git a/deploy/ci/console-nightly-releases.yml b/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
diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
@@ -14,8 +14,8 @@ resources:
     uri: git@github.com:((stratos-repository-organization))/((stratos-repository))
     branch: ((stratos-repository-branch))
     private_key: ((github-private-key))
-    # Match any Version 3 release (alpha, beta, rc) other than the actual release
-    tag_filter: "3*-*"
+    # Match any Version 4 release (alpha, beta, rc) other than the actual release
+    tag_filter: "4*-*"
 - name: helm-repo
   type: git
   source:
@@ -47,24 +47,6 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-console
-- name: fdbserver-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-repository))/stratos-fdbserver
-- name: fdbdoclayer-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-repository))/stratos-fdbdoclayer
-- name: chartsync-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-repository))/stratos-chartsync
 - name: kube-terminal-image
   type: docker-image
   source:
@@ -159,13 +141,6 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: kube-terminal-image
-        params:
-          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
-          build: stratos/deploy/containers/kube-terminal
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
     - do: 
       - put: ui-image
         params:
@@ -184,31 +159,17 @@ jobs:
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
     - do:
-      - put: fdbserver-image
-        params:
-          dockerfile: stratos/deploy/containers/monocular/fdb-server/Dockerfile
-          build: stratos/deploy/containers/monocular/fdb-server/
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
-      - put: fdbdoclayer-image
-        params:
-          dockerfile: stratos/deploy/containers/monocular/fdb-doclayer/Dockerfile
-          build: stratos/deploy/containers/monocular/fdb-doclayer/
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
-      - put: chartsync-image
+      - put: analyzers-image
         params:
-          dockerfile: stratos/src/jetstream/plugins/monocular/chart-repo/Dockerfile
-          build: stratos/src/jetstream/plugins/monocular/chart-repo/
+          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
+          build: stratos/src/jetstream/plugins/analysis/container/
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: analyzers-image
+      - put: kube-terminal-image
         params:
-          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
-          build: stratos/src/jetstream/plugins/analysis/container/
+          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
+          build: stratos/deploy/containers/kube-terminal
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))

diff --git a/deploy/ci/tasks/dev-releases/nightly-release-description b/deploy/ci/tasks/dev-releases/nightly-release-description
@@ -1 +1 @@
-This is an alpha release of Stratos v2
+Nightly Stratos build
diff --git a/deploy/ci/tasks/dev-releases/nightly-release-name b/deploy/ci/tasks/dev-releases/nightly-release-name
@@ -1 +1 @@
-Stratos 3.0.0 Nightly Release
+Stratos Nightly Release
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This is an alpha release of Stratos v2
		Nightly Stratos build
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Stratos 3.0.0 Nightly Release
		Stratos Nightly Release