From 3b6d5d990a55d21ceeb8da12357228cc2757d1cc Mon Sep 17 00:00:00 2001
From: Puru <5674762+tuladhar@users.noreply.github.com>
Date: Wed, 13 Dec 2023 15:57:07 +0545
Subject: [PATCH 1/2] Do not push to Vintage (aws-app-collection) (#47)

---
 .circleci/config.yml | 15 ---------------
 CHANGELOG.md         |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b1a47bf..ac6ff891 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,21 +35,6 @@ workflows:
             tags:
               only: /^v.*/
 
-      - architect/push-to-app-collection:
-          name: aws-app-collection
-          context: "architect"
-          app_name: "teleport-operator"
-          app_namespace: "giantswarm"
-          app_collection_repo: "aws-app-collection"
-          requires:
-            - push-teleport-operator-to-app-catalog
-            - push-to-registries
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
-
       - architect/push-to-app-collection:
           context: architect
           name: push-to-capa-app-collection
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83889207..16c4027a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove CircleCI push to Vintage (aws-app-collection)
+
 ## [0.7.0] - 2023-11-28
 
 ### Changed

From 63066c37aece3017e3c6f6d3f978571ec58eb4b2 Mon Sep 17 00:00:00 2001
From: Marian Steinbach <marian@giantswarm.io>
Date: Mon, 18 Dec 2023 17:05:02 +0100
Subject: [PATCH 2/2] Configure gsoci.azurecr.io as the registry to use by
 default (#44)

* Update default registry domain in values.yaml

* Update changelog
---
 CHANGELOG.md                       | 5 +++--
 helm/teleport-operator/values.yaml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16c4027a..5bfaf237 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
 
+### Changed
 
-## [Unreleased]
+- Configure `gsoci.azurecr.io` as the default container image registry.
 
 ### Changed
 
@@ -64,7 +66,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Leverage app platform for deploying teleport-kube-agent app
 
-
 ## [0.1.0] - 2023-08-09
 
 [Unreleased]: https://github.com/giantswarm/teleport-operator/compare/v0.7.0...HEAD
diff --git a/helm/teleport-operator/values.yaml b/helm/teleport-operator/values.yaml
index fecabae0..87b183a1 100644
--- a/helm/teleport-operator/values.yaml
+++ b/helm/teleport-operator/values.yaml
@@ -5,7 +5,7 @@ global:
 image:
   name: "giantswarm/teleport-operator"
 registry:
-  domain: docker.io
+  domain: gsoci.azurecr.io
 
 teleport:
   appCatalog: giantswarm