Merge remote-tracking branch 'upstream/master' into upstream-merge-2

cloudfoundry · Apr 15, 2020 · e2dd856 · e2dd856
2 parents eb21314 + 1e502c0
commit e2dd856
Show file tree

Hide file tree

Showing 22 changed files with 16 additions and 22 deletions.
diff --git a/deploy/ci/build-aio-image-canary.yml b/deploy/ci/build-aio-image-canary.yml
@@ -7,12 +7,10 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 - name: stratos-git-resource
   type: docker-image
   source:
     repository: splatform/stratos-git-tag-resource
-    tag: "latest"
 
 resources:
 # Stratos Git Repository

diff --git a/deploy/ci/build-aio-image-nightly.yml b/deploy/ci/build-aio-image-nightly.yml
@@ -7,12 +7,10 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 - name: stratos-git-resource
   type: docker-image
   source:
     repository: splatform/stratos-git-tag-resource
-    tag: "latest"
 
 resources:
 # Stratos Git Repository

diff --git a/deploy/ci/build-aio-image-stable.yml b/deploy/ci/build-aio-image-stable.yml
@@ -9,12 +9,10 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 - name: stratos-git-resource
   type: docker-image
   source:
     repository: splatform/stratos-git-tag-resource
-    tag: "latest"
 
 resources:
 # Stratos Git Repository

diff --git a/deploy/ci/build-images.yml b/deploy/ci/build-images.yml
@@ -6,7 +6,6 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 
 resources:
 - name: stratos

diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
@@ -5,7 +5,6 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 resources:
 # Stratos Git Repository
 - name: stratos

diff --git a/deploy/ci/console-make-release.yml b/deploy/ci/console-make-release.yml
@@ -4,7 +4,6 @@ resource_types:
   type: docker-image
   source:
     repository: splatform/stratos-git-tag-resource
-    tag: "latest"
 resources:
 # Stratos Git Repository
 - name: stratos

diff --git a/deploy/ci/console-nightly-releases.yml b/deploy/ci/console-nightly-releases.yml
@@ -7,7 +7,6 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 
 resources:
 - name: midnight

diff --git a/deploy/ci/tasks/build-images/build-helm.yml b/deploy/ci/tasks/build-images/build-helm.yml
@@ -7,7 +7,6 @@ image_resource:
   type: docker-image
   source:
    repository:  ci-registry.capbristol.com:5000/concourse-dcind
-   tag: "latest"
    insecure_registries: [ "ci-registry.capbristol.com:5000" ]
 
 run:

diff --git a/deploy/ci/tasks/build-images/generate-certs.yml b/deploy/ci/tasks/build-images/generate-certs.yml
@@ -4,7 +4,6 @@ image_resource:
   type: docker-image
   source:
     repository: ci-registry.capbristol.com:5000/opensuse
-    tag: latest
     insecure_registries: [ "ci-registry.capbristol.com:5000" ]
 
 inputs:

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -8,7 +8,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 
 run:
   path: sh

diff --git a/deploy/ci/tasks/dev-releases/check-gh-release.yml b/deploy/ci/tasks/dev-releases/check-gh-release.yml
@@ -8,7 +8,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 
 run:
   path: sh

diff --git a/deploy/ci/tasks/dev-releases/create-chart.yml b/deploy/ci/tasks/dev-releases/create-chart.yml
@@ -11,7 +11,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 
 run:
   path: sh

diff --git a/deploy/ci/tasks/dev-releases/create-helm-pr.yml b/deploy/ci/tasks/dev-releases/create-helm-pr.yml
@@ -9,7 +9,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 params:
   GIT_USER:
   GIT_EMAIL:

diff --git a/deploy/ci/tasks/dev-releases/create-nightly-chart.yml b/deploy/ci/tasks/dev-releases/create-nightly-chart.yml
@@ -10,7 +10,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 
 run:
   path: bash

diff --git a/deploy/ci/tasks/dev-releases/generate-tag-files.yml b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
@@ -10,7 +10,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 
 run:
   path: bash

diff --git a/deploy/ci/tasks/dev-releases/make-release.yml b/deploy/ci/tasks/dev-releases/make-release.yml
@@ -11,7 +11,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 run:
   path: sh
   args:

diff --git a/deploy/ci/tasks/dev-releases/update-gh-release.yml b/deploy/ci/tasks/dev-releases/update-gh-release.yml
@@ -9,7 +9,6 @@ image_resource:
   source:
    # Generated using scripts/Dockerfile.stratos-ci
    repository: splatform/stratos-ci-concourse
-   tag: "latest"
 
 run:
   path: sh

diff --git a/deploy/ci/tasks/release/sync-official-release.yml b/deploy/ci/tasks/release/sync-official-release.yml
@@ -7,7 +7,6 @@ image_resource:
   type: docker-image
   source:
    repository:  ci-registry.capbristol.com:5000/stratos-ubuntu-dind
-   tag: "latest"
    insecure_registries: [ "ci-registry.capbristol.com:5000" ]
 
 run:

diff --git a/deploy/ci/tasks/run-unit-tests.yml b/deploy/ci/tasks/run-unit-tests.yml
@@ -8,7 +8,6 @@ image_resource:
   type: docker-image
   source:
    repository:  ci-registry.ngrok.io:80/splatform/stratos-concourse
-   tag: "latest"
    insecure_registries: [ "ci-registry.ngrok.io:80" ]
 
 run:

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
@@ -73,6 +73,8 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.templatesConfigMapName|Name of config map that provides the template files for user invitation emails||
 |console.userInviteSubject|Email subject of the user invitation message||
 |console.techPreview|Enable/disable Tech Preview features|false|
+|console.ui.listMaxSize|Override the default maximum number of entities that a configured list can fetch. When a list meets this amount additional pages are not fetched||
+|console.ui.listAllowLoadMaxed|If the maximum list size is met give the user the option to fetch all results|false|
 |console.localAdminPassword|Use local admin user instead of UAA - set to a password to enable||
 |console.tlsSecretName|Secret containing TLS certificate to use for the Console||
 |console.mariadb.external|Use an external database instead of the built-in MariaDB|false|

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -255,6 +255,14 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
+        {{- if .Values.console.ui }}
+        {{- if .Values.console.ui.listMaxSize }}
+        - name: UI_LIST_MAX_SIZE
+          value: {{.Values.console.ui.listMaxSize}}
+        {{- end }}
+        - name: UI_LIST_ALLOW_LOAD_MAXED
+          value: {{ default "false" .Values.console.ui.listAllowLoadMaxed | quote }}
+        {{- end }}
         - name: MONOCULAR_CRT_PATH
           value: "/etc/monocular-certs/tls.crt"
         - name: MONOCULAR_KEY_PATH

diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
@@ -66,6 +66,12 @@ console:
   # Enable/disable Tech Preview
   techPreview: false
 
+  ui:
+    # Override the default maximum number of entities that a configured list can fetch. When a list meets this amount additional pages are not fetched 
+    listMaxSize:
+    # If the maximum list size is met give the user the option to fetch all results regardless
+    listAllowLoadMaxed: false
+
   # Use local admin user instead of UAA - set to a password to enable
   localAdminPassword: ~