Merge branch 'main' into thanos-sync-rules

Signed-off-by: Anton <44246099+antonblr@users.noreply.github.com>
bitnami · Mar 6, 2024 · a604007 · a604007
2 parents 0039252 + a7beda8
commit a604007
Show file tree

Hide file tree

Showing 739 changed files with 13,039 additions and 7,261 deletions.
diff --git a/.vib/appsmith/cypress/cypress/e2e/appsmith.cy.js b/.vib/appsmith/cypress/cypress/e2e/appsmith.cy.js
@@ -13,7 +13,7 @@ it('allows to create a new app from template', () => {
   cy.fixture('app').then((app) => {
     // Create new app
     cy.contains('Create new').click();
-    cy.get('div[data-testid*="create-app"]').click();
+    cy.get('div[data-testid="t--workspace-action-create-app"]').click();
     // Rename application
     cy.get('.t--application-name').click();
     cy.contains('Rename').click();

diff --git a/.vib/argo-workflows/cypress/cypress/e2e/argo_workflows.cy.js b/.vib/argo-workflows/cypress/cypress/e2e/argo_workflows.cy.js
@@ -30,6 +30,7 @@ it('allows submitting a workflow using a template created from a file', () => {
   cy.visit('/workflows');
 
   cy.contains('Submit New').click({ force: true });
+  cy.wait(300000);
   cy.get('.sliding-panel__body').should('be.visible').within(() => {
     cy.get('.select').click();
     cy.contains(workflowName).click();

diff --git a/.vib/argo-workflows/cypress/cypress/fixtures/workflow-template.json b/.vib/argo-workflows/cypress/cypress/fixtures/workflow-template.json
@@ -12,6 +12,12 @@
         "vib": "testing"
       }
     },
+    "securityContext" : {
+      "runAsNonRoot": true,
+      "seccompProfile": {
+        "type": "RuntimeDefault"
+     }
+    },
     "entrypoint": "echo",
     "arguments": {
       "parameters": [
@@ -40,7 +46,15 @@
           ],
           "args": [
             "{{inputs.parameters.message}}"
-          ]
+          ],
+          "securityContext": {
+             "runAsUser": 1001,
+             "runAsGroup": 1001,
+             "allowPrivilegeEscalation": false,
+             "capabilities": {
+                "drop": [ "ALL"]
+              }
+            }
         }
       }
     ],

diff --git a/.vib/flux/runtime-parameters.yaml b/.vib/flux/runtime-parameters.yaml
@@ -92,7 +92,7 @@ extraDeploy:
       interval: 5m
       url: https://github.com/mdhont/podinfo
       ref:
-        branch: master
+        branch: '{{ ternary "openshift" "master" (.Capabilities.APIVersions.Has "security.openshift.io/v1") }}'
   - apiVersion: kustomize.toolkit.fluxcd.io/v1
     kind: Kustomization
     metadata:
@@ -140,6 +140,10 @@ extraDeploy:
             namespace: '{{ include "common.names.namespace" . }}'
           interval: 1m
       values:
+        global:
+          compatibility:
+            openshift:
+              adaptSecurityContext: auto
         fullnameOverride: vib-dokuwiki
         persistence:
           enabled: false

diff --git a/.vib/keycloak/goss/goss.yaml b/.vib/keycloak/goss/goss.yaml
@@ -5,7 +5,7 @@ file:
   /opt/bitnami/keycloak/conf/keycloak.conf:
     exists: true
     filetype: file
-    mode: "0664"
+    mode: "0644"
     contents:
     - /https-port.*{{ .Vars.containerPorts.https }}/
     - /log-console-output.*{{ .Vars.logging.output }}/

diff --git a/.vib/kibana/goss/goss.yaml b/.vib/kibana/goss/goss.yaml
@@ -13,10 +13,9 @@ file:
     mode: "2777"
     owner: root
   /opt/bitnami/kibana/config/kibana.yml:
-    mode: "0664"
+    mode: "0644"
     filetype: file
     exists: true
-    group: root
     contents:
     - "{{ toJson .Vars.extraConfiguration }}"
 command:

diff --git a/.vib/nats/ginkgo/nats_test.go b/.vib/nats/ginkgo/nats_test.go
@@ -68,6 +68,19 @@ var _ = Describe("NATS", Ordered, func() {
 				return c.BatchV1().Jobs(namespace).Get(ctx, createDBJobName, getOpts)
 			}, timeout, PollingInterval).Should(WithTransform(getSucceededJobs, Equal(int32(1))))
 
+			By("puting a value into a key")
+			putJobName := fmt.Sprintf("%s-putbc-%s",
+				stsName, jobSuffix)
+			err = createJob(ctx, c, putJobName, port, "put", bucketName, "testKey", "testValue")
+			Expect(err).NotTo(HaveOccurred())
+
+			Eventually(func() (*batchv1.Job, error) {
+				return c.BatchV1().Jobs(namespace).Get(ctx, putJobName, getOpts)
+			}, timeout, PollingInterval).Should(WithTransform(getSucceededJobs, Equal(int32(1))))
+
+			// Give the application some time to sync the data
+			time.Sleep(10*time.Second)
+
 			By("scaling down to 0 replicas")
 			ss, err = utils.StsScale(ctx, c, ss, 0)
 			Expect(err).NotTo(HaveOccurred())
@@ -84,6 +97,16 @@ var _ = Describe("NATS", Ordered, func() {
 				return c.AppsV1().StatefulSets(namespace).Get(ctx, stsName, getOpts)
 			}, timeout, PollingInterval).Should(WithTransform(getAvailableReplicas, Equal(origReplicas)))
 
+			By("getting a value for a key")
+			getJobName := fmt.Sprintf("%s-getbc-%s",
+				stsName, jobSuffix)
+			err = createJob(ctx, c, getJobName, port, "get", bucketName, "testKey")
+			Expect(err).NotTo(HaveOccurred())
+
+			Eventually(func() (*batchv1.Job, error) {
+				return c.BatchV1().Jobs(namespace).Get(ctx, getJobName, getOpts)
+			}, timeout, PollingInterval).Should(WithTransform(getSucceededJobs, Equal(int32(1))))
+
 			By("creating a job to get the test bucket")
 			deleteDBJobName := fmt.Sprintf("%s-delbc-%s",
 				stsName, jobSuffix)

diff --git a/.vib/nginx/goss/goss.yaml b/.vib/nginx/goss/goss.yaml
@@ -9,9 +9,7 @@ file:
   /opt/bitnami/nginx/conf/nginx.conf:
     exists: true
     filetype: file
-    mode: "0664"
-    owner: root
-    group: root
+    mode: "0644"
     contents:
       - /listen.*{{ .Vars.containerPorts.http }}/
 command:

diff --git a/bitnami/airflow/Chart.lock b/bitnami/airflow/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 18.14.2
+  version: 18.17.1
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 13.4.6
+  version: 14.2.4
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.16.1
-digest: sha256:8fa5661b5643114e8fe43da43e12c3511772b1b4fdde1d74d4ec7aff12008b5c
-generated: "2024-02-21T11:45:50.841577627Z"
+  version: 2.18.0
+digest: sha256:f72194e2692d6530057c1a04ec1f0cbb0521e764b9d9b400622ca94fe5697841
+generated: "2024-03-05T13:16:06.432059575+01:00"
diff --git a/bitnami/airflow/Chart.yaml b/bitnami/airflow/Chart.yaml
@@ -6,19 +6,19 @@ annotations:
   licenses: Apache-2.0
   images: |
     - name: airflow
-      image: docker.io/bitnami/airflow:2.8.1-debian-12-r11
+      image: docker.io/bitnami/airflow:2.8.2-debian-12-r0
     - name: airflow-exporter
       image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-12-r24
     - name: airflow-scheduler
-      image: docker.io/bitnami/airflow-scheduler:2.8.1-debian-12-r10
+      image: docker.io/bitnami/airflow-scheduler:2.8.2-debian-12-r0
     - name: airflow-worker
-      image: docker.io/bitnami/airflow-worker:2.8.1-debian-12-r10
+      image: docker.io/bitnami/airflow-worker:2.8.2-debian-12-r0
     - name: git
-      image: docker.io/bitnami/git:2.43.2-debian-12-r1
+      image: docker.io/bitnami/git:2.44.0-debian-12-r0
     - name: os-shell
-      image: docker.io/bitnami/os-shell:12-debian-12-r15
+      image: docker.io/bitnami/os-shell:12-debian-12-r16
 apiVersion: v2
-appVersion: 2.8.1
+appVersion: 2.8.2
 dependencies:
 - condition: redis.enabled
   name: redis
@@ -27,7 +27,7 @@ dependencies:
 - condition: postgresql.enabled
   name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 13.x.x
+  version: 14.x.x
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
   tags:
@@ -47,4 +47,4 @@ maintainers:
 name: airflow
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/airflow
-version: 16.8.2
+version: 17.1.0
diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md
@@ -55,11 +55,12 @@ The command removes all the Kubernetes components associated with the chart and
 
 ### Global parameters
 
-| Name                      | Description                                     | Value |
-| ------------------------- | ----------------------------------------------- | ----- |
-| `global.imageRegistry`    | Global Docker image registry                    | `""`  |
-| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]`  |
-| `global.storageClass`     | Global StorageClass for Persistent Volume(s)    | `""`  |
+| Name                                                  | Description                                                                                                                                                                                                                                                                                                                                                         | Value      |
+| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
+| `global.imageRegistry`                                | Global Docker image registry                                                                                                                                                                                                                                                                                                                                        | `""`       |
+| `global.imagePullSecrets`                             | Global Docker registry secret names as an array                                                                                                                                                                                                                                                                                                                     | `[]`       |
+| `global.storageClass`                                 | Global StorageClass for Persistent Volume(s)                                                                                                                                                                                                                                                                                                                        | `""`       |
+| `global.compatibility.openshift.adaptSecurityContext` | Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) | `disabled` |
 
 ### Common parameters
 
@@ -765,6 +766,10 @@ Find more information about how to deal with common errors related to Bitnami's
 
 ## Upgrading
 
+### To 17.0.0
+
+This major release bumps the PostgreSQL chart version to [14.x.x](https://github.com/bitnami/charts/pull/22750); no major issues are expected during the upgrade.
+
 ### To 16.0.0
 
 This major updates the PostgreSQL subchart to its newest major, 13.0.0. [Here](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#to-1300) you can find more information about the changes introduced in that version.
@@ -951,4 +956,4 @@ 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.
+limitations under the License.
diff --git a/bitnami/airflow/templates/_git_helpers.tpl b/bitnami/airflow/templates/_git_helpers.tpl
@@ -80,7 +80,7 @@ Usage:
   image: {{ include "git.image" .context | quote }}
   imagePullPolicy: {{ .context.Values.git.image.pullPolicy | quote }}
 {{- if .securityContext.enabled }}
-  securityContext: {{- omit .securityContext "enabled" | toYaml | nindent 4 }}
+  securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .securityContext "context" $) | nindent 4 }}
 {{- end }}
 {{- if .context.Values.git.clone.resources }}
   resources: {{- toYaml .context.Values.git.clone.resources | nindent 4 }}
@@ -145,7 +145,7 @@ Usage:
   image: {{ include "git.image" .context | quote }}
   imagePullPolicy: {{ .context.Values.git.image.pullPolicy | quote }}
 {{- if .securityContext.enabled }}
-  securityContext: {{- omit .securityContext "enabled" | toYaml | nindent 4 }}
+  securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .securityContext "context" $) | nindent 4 }}
 {{- end }}
 {{- if .context.Values.git.sync.resources }}
   resources: {{- toYaml .context.Values.git.sync.resources | nindent 4 }}

diff --git a/bitnami/airflow/templates/_helpers.tpl b/bitnami/airflow/templates/_helpers.tpl
@@ -204,7 +204,7 @@ Load DAGs init-container
   image: {{ include "airflow.dags.image" .context }}
   imagePullPolicy: {{ .context.Values.dags.image.pullPolicy }}
   {{- if $compDefinition.containerSecurityContext.enabled }}
-  securityContext: {{- omit $compDefinition.containerSecurityContext "enabled" | toYaml | nindent 4 }}
+  securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" $compDefinition.containerSecurityContext "context" $) | nindent 4 }}
   {{- end }}
   command:
     - /bin/bash

diff --git a/bitnami/airflow/templates/config/configmap.yaml b/bitnami/airflow/templates/config/configmap.yaml
@@ -66,14 +66,14 @@ data:
       {{- end }}
       serviceAccountName: {{ include "airflow.serviceAccountName" . }}
       {{- if .Values.worker.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.worker.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.worker.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       initContainers: {{- include "airflow.git.containers.clone" (dict "securityContext" .Values.worker.containerSecurityContext "context" $) | trim | nindent 8 }}
         - name: k8s-executor-init-config
           image: {{ include "airflow.workerImage" . }}
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
           {{- if .Values.worker.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.worker.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.worker.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           command:
             - /bin/bash
@@ -115,7 +115,7 @@ data:
           image: {{ include "airflow.workerImage" . }}
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
           {{- if .Values.worker.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.worker.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.worker.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}

diff --git a/bitnami/airflow/templates/metrics/deployment.yaml b/bitnami/airflow/templates/metrics/deployment.yaml
@@ -60,13 +60,13 @@ spec:
       schedulerName: {{ .Values.metrics.schedulerName }}
       {{- end }}
       {{- if .Values.metrics.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.metrics.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.metrics.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       containers:
         - image: {{ include "airflow.metrics.image" . | quote }}
           name: airflow-exporter
           {{- if .Values.metrics.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.metrics.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}

diff --git a/bitnami/airflow/templates/scheduler/deployment.yaml b/bitnami/airflow/templates/scheduler/deployment.yaml
@@ -68,7 +68,7 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "airflow.serviceAccountName" . }}
       {{- if .Values.scheduler.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.scheduler.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.scheduler.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       initContainers:
         {{- include "airflow.git.containers.clone" (dict "securityContext" .Values.scheduler.containerSecurityContext "context" $) | trim | nindent 8 }}
@@ -87,7 +87,7 @@ spec:
           image: {{ include "airflow.schedulerImage" . | quote }}
           imagePullPolicy: {{ .Values.scheduler.image.pullPolicy | quote }}
           {{- if .Values.scheduler.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.scheduler.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.scheduler.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}

diff --git a/bitnami/airflow/templates/web/deployment.yaml b/bitnami/airflow/templates/web/deployment.yaml
@@ -67,7 +67,7 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "airflow.serviceAccountName" . }}
       {{- if .Values.web.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.web.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.web.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       initContainers:
         {{- include "airflow.git.containers.clone" (dict "securityContext" .Values.web.containerSecurityContext "context" $) | trim | nindent 8 }}
@@ -86,7 +86,7 @@ spec:
           image: {{ include "airflow.image" . }}
           imagePullPolicy: {{ .Values.web.image.pullPolicy | quote }}
           {{- if .Values.web.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.web.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.web.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}

diff --git a/bitnami/airflow/templates/worker/statefulset.yaml b/bitnami/airflow/templates/worker/statefulset.yaml
@@ -72,7 +72,7 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "airflow.serviceAccountName" . }}
       {{- if .Values.worker.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.worker.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.worker.podSecurityContext "context" $) | nindent 8 }}
       {{- end }}
       initContainers:
         {{- include "airflow.git.containers.clone" (dict "securityContext" .Values.worker.containerSecurityContext "context" $) | trim | nindent 8 }}
@@ -91,7 +91,7 @@ spec:
           image: {{ include "airflow.workerImage" . }}
           imagePullPolicy: {{ .Values.worker.image.pullPolicy | quote }}
           {{- if .Values.worker.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.worker.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.worker.containerSecurityContext "context" $) | nindent 12 }}
           {{- end }}
           {{- if .Values.diagnosticMode.enabled }}
           command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}