diff --git a/.github/workflows/pull-request-queue.yaml b/.github/workflows/pull-request-queue.yaml index d4bb9bb74b..90bb929372 100644 --- a/.github/workflows/pull-request-queue.yaml +++ b/.github/workflows/pull-request-queue.yaml @@ -1,8 +1,9 @@ name: enqueue-pr-test on: # When a PR is approved, add the queue label - pull_request_review: - types: [submitted] + #pull_request_review: + # types: [submitted] + workflow_dispatch: {} jobs: enqueue: diff --git a/chart/README.md b/chart/README.md index 5976067bfc..15d6f3cb56 100644 --- a/chart/README.md +++ b/chart/README.md @@ -49,5 +49,5 @@ instructions. [3]: https://github.com/cloudfoundry-incubator/kubecf/blob/master/doc/Contribute.md#customization [4]: https://quarks.suse.dev/docs/quarks-operator/concepts/variables/#explicit-variables [5]: https://quarks.suse.dev/docs/quarks-operator/concepts/variables/#implicit-variables -[6]: https://kubecf.suse.dev/docs/getting-started/kubernetes-deploy/ -[7]: https://kubecf.suse.dev/docs/ +[6]: https://kubecf.io/docs/deployment/kubernetes-deploy/ +[7]: https://kubecf.io/docs/ diff --git a/chart/assets/operations/instance_groups/diego-cell.yaml b/chart/assets/operations/instance_groups/diego-cell.yaml index 2da76c8467..e19f58d561 100644 --- a/chart/assets/operations/instance_groups/diego-cell.yaml +++ b/chart/assets/operations/instance_groups/diego-cell.yaml @@ -28,15 +28,7 @@ value: true # Configure the size of the diego cell grootfs store -# We are repurposing reserved_space_for_other_jobs_in_mb as the size of the grootfs store -- type: replace - path: /instance_groups/name=diego-cell/jobs/name=garden/properties/grootfs?/reserved_space_for_other_jobs_in_mb - value: {{ .Values.sizing.diego_cell.ephemeral_disk.size }} - -- type: replace - path: /instance_groups/name=diego-cell/jobs/name=rep/properties/diego?/executor/disk_capacity_mb - value: {{ .Values.sizing.diego_cell.ephemeral_disk.size }} - +{{- $ephemeral_disk_size := .Values.sizing.diego_cell.ephemeral_disk.size }} {{- if .Values.sizing.diego_cell.ephemeral_disk.storage_class }} # Use a PVC for garden data - type: replace @@ -45,8 +37,22 @@ - type: replace path: /instance_groups/name=diego-cell/persistent_disk_type? value: {{ .Values.sizing.diego_cell.ephemeral_disk.storage_class | quote }} +- type: replace + path: /instance_groups/name=diego-cell/vm_resources?/ephemeral_disk_size + value: {{ .Values.sizing.diego_cell.ephemeral_disk.size }} +{{- /* When using a storage class / PVC, reserve some room for other uses */}} +{{- $ephemeral_disk_size = sub $ephemeral_disk_size 2048 }} {{- end }} +# We are repurposing reserved_space_for_other_jobs_in_mb as the size of the grootfs store +- type: replace + path: /instance_groups/name=diego-cell/jobs/name=garden/properties/grootfs?/reserved_space_for_other_jobs_in_mb + value: {{ $ephemeral_disk_size }} + +- type: replace + path: /instance_groups/name=diego-cell/jobs/name=rep/properties/diego?/executor/disk_capacity_mb + value: {{ $ephemeral_disk_size }} + # The loggr UDP forwarder needs some env vars specific to the container they're running in # The INDEX env var cannot be rendered properly as part of BPM rendering, it can only be set # correctly through pod reflection. Without this, the index would be 0 for any replica diff --git a/chart/config/sle15.yaml b/chart/config/sle15.yaml index f4d2991323..ea4d7c7fe6 100644 --- a/chart/config/sle15.yaml +++ b/chart/config/sle15.yaml @@ -16,7 +16,7 @@ stacks: version: "10.93" url: docker.io/cfcontainerization suse-staticfile-buildpack: - version: "1.5.11.1" + version: "1.5.12.1" suse-java-buildpack: version: "4.32.1.1" suse-ruby-buildpack: @@ -24,11 +24,11 @@ stacks: suse-dotnet-core-buildpack: version: "2.3.16.1" suse-nodejs-buildpack: - version: "1.7.29.1" + version: "1.7.30.1" suse-go-buildpack: version: "1.9.19.1" suse-python-buildpack: - version: "1.7.22.1" + version: "1.7.23.1" suse-php-buildpack: version: "4.4.22.1" suse-nginx-buildpack: diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index 579492e8b0..81f5a70679 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -19,6 +19,10 @@ {{- if not .Values.features.eirini.enabled }} {{- $cell_count := .Values.sizing.diego_cell.instances | default 1 }} {{- $disk_size := .Values.sizing.diego_cell.ephemeral_disk.size }} + {{- if .Values.sizing.diego_cell.storage_class }} + {{- /* when using a storage class, we will reserve space for other uses. */}} + {{- $disk_size = sub $disk_size 2048 }} + {{- end }} {{- $app_disk_quota := 1024 }} {{- include "_config.lookup" (list $ "properties.api.cloud_controller_ng.cc.default_app_disk_in_mb") }} @@ -34,4 +38,4 @@ {{- end }} The online documentation (release notes, deployment guide) can be found at - https://kubecf.suse.dev/docs + https://kubecf.io/docs diff --git a/chart/templates/rbac.yaml b/chart/templates/rbac.yaml index afc8dba583..57acb70998 100644 --- a/chart/templates/rbac.yaml +++ b/chart/templates/rbac.yaml @@ -10,7 +10,9 @@ metadata: spec: allowPrivilegeEscalation: true allowedCapabilities: + - NET_ADMIN - NET_BIND_SERVICE + - NET_RAW - SYS_ADMIN - SYS_RESOURCE defaultAllowPrivilegeEscalation: true diff --git a/chart/values.yaml b/chart/values.yaml index f3549a39fe..ccf68d78fd 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -371,7 +371,7 @@ features: resource_directory_key: ~ # Configuration for the external database; see also features.embedded_database. Please refer to - # https://kubecf.suse.dev/docs/getting-started/kubernetes-deploy/#external-database for details. + # https://kubecf.io/docs/deployment/kubernetes-deploy/#external-database for details. external_database: enabled: false require_ssl: false @@ -447,7 +447,7 @@ testing: ccdb: encryption: # Configure CCDB key rotation. Please see - # https://kubecf.suse.dev/docs/tasks/secrets/#rotating-the-ccdb-encryption-keys for details. + # https://kubecf.io/docs/tasks/secrets/#rotating-the-ccdb-encryption-keys for details. rotation: # Key labels must be <= 240 characters long. key_labels: diff --git a/dependencies.yaml b/dependencies.yaml index cfe2bfa0f3..b27386401f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -103,9 +103,9 @@ binaries: # Additional files we need to download; see http_file() invocation in WORKSPACE. external_files: cf_operator: - sha256: b9681197c6e53d115396c5e837a5dbb0fa2c3c26d89cb3e274e3d026a846f6f6 + sha256: b45835a3b629cf099901ba37d1ba99744d99ac32a41b35aafc2e445fd74ad016 url: https://s3.amazonaws.com/cf-operators/release/helm-charts/cf-operator-{version}.tgz - version: 6.1.10%2B0.g7b1a5f2f + version: 6.1.12%2B0.gfc4e8327 kube_dashboard: sha256: f849252870818a2971dfc3c4f8a8c5f58a57606bc2b5f221d7ab693e1d1190e0 url: https://raw.githubusercontent.com/kubernetes/dashboard/{version}/aio/deploy/recommended.yaml