Merge branch 'master' into release-0.34

astronomer · Apr 8, 2024 · 2124abc · 2124abc
2 parents a3d90ec + a4c4b19
commit 2124abc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -358,7 +358,7 @@ workflows:
             parameters:
               docker_image:
                 - quay.io/astronomer/ap-alertmanager:0.27.0
-                - quay.io/astronomer/ap-astro-ui:0.34.4
+                - quay.io/astronomer/ap-astro-ui:0.34.5
                 - quay.io/astronomer/ap-auth-sidecar:1.25.4
                 - quay.io/astronomer/ap-awsesproxy:1.5.0-8
                 - quay.io/astronomer/ap-base:3.18.6-1
@@ -397,7 +397,7 @@ workflows:
             parameters:
               docker_image:
                 - quay.io/astronomer/ap-alertmanager:0.27.0
-                - quay.io/astronomer/ap-astro-ui:0.34.4
+                - quay.io/astronomer/ap-astro-ui:0.34.5
                 - quay.io/astronomer/ap-auth-sidecar:1.25.4
                 - quay.io/astronomer/ap-awsesproxy:1.5.0-8
                 - quay.io/astronomer/ap-base:3.18.6-1
@@ -543,21 +543,11 @@ workflows:
             - lint
             - run_pre_commit
             - unittest-charts
-
-      - platform-1-25-16:
-          requires:
-            - build-artifact
-
-      - platform-1-29-2:
-          requires:
-            - build-artifact
-
       - release-to-internal:
           context:
             - gcp-astronomer-prod
           requires:
-            - platform-1-25-16
-            - platform-1-29-2
+            - build-artifact
           filters:
             branches:
               only:

diff --git a/.circleci/config.yml.j2 b/.circleci/config.yml.j2
@@ -407,18 +407,11 @@ workflows:
             - lint
             - run_pre_commit
             - unittest-charts
-{% for version in kube_versions %}{% if version in [kube_versions[0], kube_versions[-1]] %}
-      - platform-{{ version | replace(".", "-") }}:
-          requires:
-            - build-artifact
-{% endif %}{% endfor %}
       - release-to-internal:
           context:
             - gcp-astronomer-prod
           requires:
-{%- for version in [kube_versions[0], kube_versions[-1]] %}
-            - platform-{{ version | replace(".", "-") }}
-{%- endfor %}
+            - build-artifact
           filters:
             branches:
               only:

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: astronomer
-version: 0.34.1-rc3
-appVersion: 0.34.1-rc3
+version: 0.34.1-rc4
+appVersion: 0.34.1-rc4
 description: Helm chart to deploy the Astronomer Platform
 icon: https://www.astronomer.io/static/iconforLIGHTbackground.svg
 keywords:

diff --git a/charts/astronomer/Chart.yaml b/charts/astronomer/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: astronomer
-version: 0.34.1-rc3
+version: 0.34.1-rc4
 description: A Helm chart to deploy the Astronomer module
 keywords:
   - astronomer
diff --git a/charts/astronomer/values.yaml b/charts/astronomer/values.yaml
@@ -28,7 +28,7 @@ images:
     pullPolicy: IfNotPresent
   astroUI:
     repository: quay.io/astronomer/ap-astro-ui
-    tag: 0.34.4
+    tag: 0.34.5
     pullPolicy: IfNotPresent
   dbBootstrapper:
     repository: quay.io/astronomer/ap-db-bootstrapper