Merge branch 'master' into release-0.34

astronomer · Mar 26, 2024 · e6b229b · e6b229b
2 parents 5c9c4ce + 67c6e2d
commit e6b229b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -361,7 +361,7 @@ workflows:
                 - quay.io/astronomer/ap-astro-ui:0.34.4
                 - quay.io/astronomer/ap-auth-sidecar:1.25.4
                 - quay.io/astronomer/ap-awsesproxy:1.5.0-7
-                - quay.io/astronomer/ap-base:3.18.6
+                - quay.io/astronomer/ap-base:3.18.6-1
                 - quay.io/astronomer/ap-blackbox-exporter:0.24.0-6
                 - quay.io/astronomer/ap-cli-install:0.26.23
                 - quay.io/astronomer/ap-commander:0.34.0
@@ -400,7 +400,7 @@ workflows:
                 - quay.io/astronomer/ap-astro-ui:0.34.4
                 - quay.io/astronomer/ap-auth-sidecar:1.25.4
                 - quay.io/astronomer/ap-awsesproxy:1.5.0-7
-                - quay.io/astronomer/ap-base:3.18.6
+                - quay.io/astronomer/ap-base:3.18.6-1
                 - quay.io/astronomer/ap-blackbox-exporter:0.24.0-6
                 - quay.io/astronomer/ap-cli-install:0.26.23
                 - quay.io/astronomer/ap-commander:0.34.0

diff --git a/charts/astronomer/templates/houston/worker/houston-worker-deployment.yaml b/charts/astronomer/templates/houston/worker/houston-worker-deployment.yaml
@@ -94,7 +94,7 @@ spec:
           command:
             {{- toYaml .Values.houston.worker.command | nindent 12 }}
           {{ else }}
-          command: ["yarn", "worker"]
+          command: ["/bin/sh", "-c", "update-ca-certificates;yarn worker"]
           {{- end }}
           {{- if .Values.houston.worker.args }}
           args:

diff --git a/charts/astronomer/values.yaml b/charts/astronomer/values.yaml
@@ -40,7 +40,7 @@ images:
     pullPolicy: IfNotPresent
 
 securityContext:
-    runAsNonRoot: true
+  runAsNonRoot: true
 
 astroUI:
   replicas: 2

diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml
@@ -14,7 +14,7 @@ images:
     pullPolicy: IfNotPresent
   init:
     repository: quay.io/astronomer/ap-base # needs root permissions for sysctl changes
-    tag: 3.18.6
+    tag: 3.18.6-1
     pullPolicy: IfNotPresent
   curator:
     repository: quay.io/astronomer/ap-curator

diff --git a/values.yaml b/values.yaml
@@ -26,7 +26,7 @@ global:
     containerdnodeAffinitys: []
     certCopier:
       repository: quay.io/astronomer/ap-base
-      tag: 3.18.6
+      tag: 3.18.6-1
       pullPolicy: IfNotPresent
   # Global flag to enable to user to enable/disable Astronomer platform
   # level Network Policy