diff --git a/.circleci/config.yml b/.circleci/config.yml index cf97b34e..5fffe1fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - architect: giantswarm/architect@4.34.1 + architect: giantswarm/architect@4.35.5 workflows: build: @@ -15,44 +15,14 @@ workflows: tags: only: /^v.*/ - - architect/push-to-docker: - context: "architect" - name: push-capa-iam-operator-to-quay - image: "quay.io/giantswarm/capa-iam-operator" - username_envar: "QUAY_USERNAME" - password_envar: "QUAY_PASSWORD" - requires: - - go-build - # Needed to trigger job also on git tag. - filters: - tags: - only: /^v.*/ - - architect/push-to-docker: - context: "architect" - name: push-capa-iam-operator-to-docker - image: "docker.io/giantswarm/capa-iam-operator" - username_envar: "DOCKER_USERNAME" - password_envar: "DOCKER_PASSWORD" + - architect/push-to-registries: + context: architect + name: push-to-registries requires: - go-build - # Needed to trigger job also on git tag. filters: tags: only: /^v.*/ - - - architect/push-to-docker: - context: "architect" - name: push-capa-iam-operator-to-aliyun - image: "giantswarm-registry.cn-shanghai.cr.aliyuncs.com/giantswarm/capa-iam-operator" - username_envar: "ALIYUN_USERNAME" - password_envar: "ALIYUN_PASSWORD" - requires: - - go-build - # Needed to trigger job also on git tag. - filters: - tags: - only: /^v.*/ - - architect/push-to-app-catalog: context: "architect" name: push-capa-iam-operator-to-app-catalog @@ -60,8 +30,7 @@ workflows: app_catalog_test: "control-plane-test-catalog" chart: "capa-iam-operator" requires: - - push-capa-iam-operator-to-quay - # Needed to trigger job also on git tag. + - push-to-registries filters: tags: only: /^v.*/ @@ -73,9 +42,7 @@ workflows: app_collection_repo: "capa-app-collection" requires: - push-capa-iam-operator-to-app-catalog - - push-capa-iam-operator-to-aliyun - - push-capa-iam-operator-to-quay - - push-capa-iam-operator-to-docker + - push-to-registries filters: branches: ignore: /.*/ diff --git a/go.mod b/go.mod index 665a88a4..f446a8a3 100644 --- a/go.mod +++ b/go.mod @@ -4,14 +4,14 @@ go 1.16 require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect - github.com/aws/aws-sdk-go v1.48.3 + github.com/aws/aws-sdk-go v1.48.7 github.com/benbjohnson/clock v1.3.0 // indirect github.com/giantswarm/microerror v0.4.1 github.com/go-logr/logr v1.3.0 github.com/golang/mock v1.6.0 github.com/google/uuid v1.4.0 github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/onsi/ginkgo/v2 v2.13.1 + github.com/onsi/ginkgo/v2 v2.13.2 github.com/onsi/gomega v1.30.0 github.com/pkg/errors v0.9.1 github.com/rogpeppe/go-internal v1.8.0 // indirect diff --git a/go.sum b/go.sum index 45e2c37e..cb741dd8 100644 --- a/go.sum +++ b/go.sum @@ -246,8 +246,8 @@ github.com/aws/aws-lambda-go v1.32.0/go.mod h1:IF5Q7wj4VyZyUFnZ54IQqeWtctHQ9tz+K github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/aws/aws-sdk-go v1.43.28/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.43.29/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.48.3 h1:btYjT+opVFxUbRz+qSCjJe07cdX82BHmMX/FXYmoL7g= -github.com/aws/aws-sdk-go v1.48.3/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.48.7 h1:gDcOhmkohlNk20j0uWpko5cLBbwSkB+xpkshQO45F7Y= +github.com/aws/aws-sdk-go v1.48.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/awslabs/goformation/v4 v4.19.5/go.mod h1:JoNpnVCBOUtEz9bFxc9sjy8uBUCLF5c4D1L7RhRTVM8= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -791,8 +791,8 @@ github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3Ro github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0= github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= -github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs= +github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=