Skip to content
This repository has been archived by the owner on Jul 6, 2022. It is now read-only.

Commit

Permalink
Migrate image release destination registry to Azure Container Registry (
Browse files Browse the repository at this point in the history
#699)

* migrate to Azure Container Registry

* fix docker login

* fix according to comment

* upgrade and fix eventhubs client version
  • Loading branch information
zhongyi-zhang authored May 8, 2019
1 parent cba37e2 commit 52d35ce
Show file tree
Hide file tree
Showing 21 changed files with 488 additions and 75 deletions.
8 changes: 5 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install-make-and-git-step: &install-make-and-git-step
apk add make git
log-into-docker-hub-step: &log-into-docker-hub-step
name: Log into Docker Hub
command: docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"
command: docker login "${DOCKER_REGISTRY}" -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"

jobs:
lint:
Expand Down Expand Up @@ -154,7 +154,8 @@ jobs:
publish-rc-images:
<<: *base-docker-job
environment:
DOCKER_REPO: microsoft/
DOCKER_REGISTRY: osbapublicacr.azurecr.io
DOCKER_REGISTRY_NAMESPACE: microsoft
steps:
- checkout
- setup_remote_docker
Expand All @@ -168,7 +169,8 @@ jobs:
publish-release-images:
<<: *base-docker-job
environment:
DOCKER_REPO: microsoft/
DOCKER_REGISTRY: osbapublicacr.azurecr.io
DOCKER_REGISTRY_NAMESPACE: microsoft
steps:
- checkout
- setup_remote_docker
Expand Down
9 changes: 5 additions & 4 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@

[[constraint]]
name = "github.com/Azure/azure-event-hubs-go"
version = "v1.3.0"

[[override]]
name = "golang.org/x/sys"
Expand Down
16 changes: 12 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,21 @@ DOCKER_CMD_INT := $(DOCKER_CMD_BASE) -it $(DEV_IMAGE)
# for 'open-service-broker-azure'
#
# See https://github.com/Azure/open-service-broker-azure/issues/100
ifdef DOCKER_REGISTRY
DOCKER_REGISTRY := $(DOCKER_REGISTRY)/
endif

ifdef DOCKER_REGISTRY_NAMESPACE
DOCKER_REGISTRY_NAMESPACE := $(DOCKER_REGISTRY_NAMESPACE)/
endif

BASE_IMAGE_NAME = azure-service-broker

RC_IMAGE_NAME = $(DOCKER_REPO)$(BASE_IMAGE_NAME):$(GIT_VERSION)
RC_MUTABLE_IMAGE_NAME = $(DOCKER_REPO)$(BASE_IMAGE_NAME):canary
RC_IMAGE_NAME = $(DOCKER_REGISTRY)$(DOCKER_REGISTRY_NAMESPACE)$(BASE_IMAGE_NAME):$(GIT_VERSION)
RC_MUTABLE_IMAGE_NAME = $(DOCKER_REGISTRY)$(DOCKER_REGISTRY_NAMESPACE)$(BASE_IMAGE_NAME):canary

REL_IMAGE_NAME = $(DOCKER_REPO)$(BASE_IMAGE_NAME):$(REL_VERSION)
REL_MUTABLE_IMAGE_NAME = $(DOCKER_REPO)$(BASE_IMAGE_NAME):latest
REL_IMAGE_NAME = $(DOCKER_REGISTRY)$(DOCKER_REGISTRY_NAMESPACE)$(BASE_IMAGE_NAME):$(REL_VERSION)
REL_MUTABLE_IMAGE_NAME = $(DOCKER_REGISTRY)$(DOCKER_REGISTRY_NAMESPACE)$(BASE_IMAGE_NAME):latest

################################################################################
# Utility targets #
Expand Down
2 changes: 1 addition & 1 deletion contrib/k8s/charts/open-service-broker-azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Broker chart and their default values.
| Parameter | Description | Default |
| --------- | ----------- | ------- |
| `logLevel` | Log level (options: PANIC, FATAL, ERROR, WARN, INFO, DEBUG). | `"INFO"` |
| `image.repository` | Docker image location, _without_ the tag. | `"microsoft/azure-service-broker"` |
| `image.repository` | Docker image location, _without_ the tag. | `"osbapublicacr.azurecr.io/microsoft/azure-service-broker"` |
| `image.tag` | Tag / version of the Docker image. | OSBA release matching chart version |
| `image.pullPolicy` | `"IfNotPresent"`, `"Always"`, or `"Never"`; When launching a pod, this option indicates when to pull the OSBA Docker image. | `"IfNotPresent"` |
| `registerBroker` | Whether to register this broker with the Kubernetes Service Catalog. If true, the Kubernetes Service Catalog must already be installed on the cluster. Marking this option false is useful for scenarios wherein one wishes to host the broker in a separate cluster than the Service Catalog (or other client) that will access it. | `true` |
Expand Down
2 changes: 1 addition & 1 deletion contrib/k8s/charts/open-service-broker-azure/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ logLevel: "INFO"

image:
## Image location, NOT including the tag
repository: microsoft/azure-service-broker
repository: osbapublicacr.azurecr.io/microsoft/azure-service-broker
## Image tag
tag: v0.0.1 # This gets automatically overridden by our release process
## "IfNotPresent", "Always", or "Never"
Expand Down
2 changes: 1 addition & 1 deletion contrib/openshift/osba-os-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ objects:
spec:
containers:
- name: open-service-broker-azure
image: "microsoft/azure-service-broker:${OSBA_VERSION}"
image: "osbapublicacr.azurecr.io/microsoft/azure-service-broker:${OSBA_VERSION}"
imagePullPolicy: IfNotPresent
env:
- name: ENVIRONMENT
Expand Down
13 changes: 12 additions & 1 deletion vendor/github.com/Azure/azure-event-hubs-go/changelog.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

134 changes: 122 additions & 12 deletions vendor/github.com/Azure/azure-event-hubs-go/event.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/Azure/azure-event-hubs-go/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions vendor/github.com/Azure/azure-event-hubs-go/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 52d35ce

Please sign in to comment.