Skip to content

Commit

Permalink
Merge pull request #4 from lburgazzoli/ci
Browse files Browse the repository at this point in the history
switch container registry from quay.io/lburgazzoli to docker.io/daprio
  • Loading branch information
salaboy authored Jul 31, 2023
2 parents 9cb791d + 534f7f7 commit cb923ea
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ concurrency:

env:
IMAGE_VERSION: ${{ github.ref_name}}
IMAGE_TAG_BASE: "quay.io/lburgazzoli/dapr-operator"
IMAGE_TAG_BASE: "${{ vars.DOCKER_DAPRIO_REGISTRY }}/daprio/dapr-kubernetes-operator"

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: check-out
uses: actions/checkout@v3
- name: Login to Quay.io
- name: Container Registry login
uses: docker/login-action@v2
env:
DOCKER_REGISTRY_ID: ${{ vars.DOCKER_DAPRIO_REGISTRY }}
with:
registry: quay.io
username: ${{ secrets.CONTAINER_REGISTRY_USERNAME }}
password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
username: ${{ secrets.DOCKER_REGISTRY_ID }}
password: ${{ secrets.DOCKER_REGISTRY_PASS }}
- name: Build Operator Container Image
run: |
export VERSION="${IMAGE_VERSION#v}"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# dapr.io/dapr-operator-bundle:$VERSION and dapr.io/dapr-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/lburgazzoli/dapr-operator
IMAGE_TAG_BASE ?= docker.io/daprio/dapr-kubernetes-operator

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
Expand Down
8 changes: 4 additions & 4 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resources:
- manager.yaml
- manager.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/lburgazzoli/dapr-operator
newTag: v0.0.22
- name: controller
newName: docker.io/daprio/dapr-kubernetes-operator
newTag: v0.0.22
6 changes: 3 additions & 3 deletions config/samples/catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: dapr-catalog
name: daprio-catalog
namespace: openshift-marketplace
spec:
sourceType: grpc
image: quay.io/lburgazzoli/dapr-operator-catalog:latest
displayName: Dapr Catalog
image: docker.io/daprio/dapr-kubernetes-operator-catalog:latest
displayName: dapr.io catalog
publisher: dapr.io
updateStrategy:
registryPoll:
Expand Down

0 comments on commit cb923ea

Please sign in to comment.