Skip to content

Commit

Permalink
Merge branch 'main' into renovate/github.com-google-uuid-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
ssyno authored Dec 18, 2023
2 parents acb1294 + 63066c3 commit 7662de7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
15 changes: 0 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ 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

- Remove CircleCI push to Vintage (aws-app-collection)

## [0.7.0] - 2023-11-28

Expand Down Expand Up @@ -60,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
Expand Down
2 changes: 1 addition & 1 deletion helm/teleport-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ global:
image:
name: "giantswarm/teleport-operator"
registry:
domain: docker.io
domain: gsoci.azurecr.io

teleport:
appCatalog: giantswarm
Expand Down

0 comments on commit 7662de7

Please sign in to comment.