Skip to content

Commit

Permalink
feat: pull 'certificate-installation' image from the same mirror as f…
Browse files Browse the repository at this point in the history
…or 'hostess'

HOSTESS_DOCKER_REGISTRY env var now sets registry host for both
images in registry-mirror Daemonsets.
  • Loading branch information
sitnik committed Dec 16, 2020
1 parent 9e0bf27 commit 6699e33
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Name | description | default
DOCKER_CERTIFICATE_SECRET | You **must** provide a certificate to enable TLS between the docker daemon and the registry and create a secret from it, this variable is the name of the secret | None
NAMESPACE | The namespace in which the resources should be created. This should be the same namespace as where the container is running | default
SECONDS_BETWEEN_STREAMS | Time to sleep between calls to the API. The operator will occasionally lose connection or else fail to run if the Custom Resource Definition does not exist. | 30
HOSTESS_DOCKER_REGISTRY | The docker registry where mirror-hostess is to be pulled from. | docker.io
HOSTESS_DOCKER_REGISTRY | The docker registry where mirror-hostess and alpine are to be pulled from. | docker.io
HOSTESS_DOCKER_IMAGE | The name of the docker image for mirror-hostess. | ocadotechnology/mirror-hostess
HOSTESS_DOCKER_TAG | The tag for the mirror-hostess docker image. | 1.1.0
SS_DS_LABELS | (Optional) StatefulSet and DaemonSet labels | None
Expand Down
3 changes: 2 additions & 1 deletion mirroroperator/registrymirror.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ def generate_daemon_set(self, daemon_set):
"-u",
"-x"
],
image="alpine:3.6",
image="{}/alpine:3.6".format(
self.hostess_docker_registry),
image_pull_policy="IfNotPresent",
resources=client.V1ResourceRequirements(
requests={"memory": "1Mi", "cpu": "0.001"},
Expand Down

0 comments on commit 6699e33

Please sign in to comment.