Merge pull request #52 from sitnik/improve-daemonsets

Improve daemonsets

README.md

@@ -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

mirroroperator/registrymirror.py

@@ -264,7 +264,7 @@ def generate_daemon_set(self, daemon_set):
                                     self.hostess_docker_registry,
                                     self.hostess_docker_image,
                                     self.hostess_docker_tag),
-                                image_pull_policy="Always",
+                                image_pull_policy="IfNotPresent",
                                 resources=client.V1ResourceRequirements(
                                     requests={
                                         "memory": "64Mi", "cpu": "0.001"
@@ -298,8 +298,9 @@ def generate_daemon_set(self, daemon_set):
                                     "-u",
                                     "-x"
                                 ],
-                                image="alpine:3.6",
-                                image_pull_policy="Always",
+                                image="{}/alpine:3.6".format(
+                                    self.hostess_docker_registry),
+                                image_pull_policy="IfNotPresent",
                                 resources=client.V1ResourceRequirements(
                                     requests={"memory": "1Mi", "cpu": "0.001"},
                                     limits={"memory": "32Mi", "cpu": "0.1"}