Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve daemonsets #52

Merged
merged 2 commits into from
Dec 17, 2020
Merged

Improve daemonsets #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0bf27
fix: change imagePullPolicy for certificate-installation containers
sitnik Dec 16, 2020
6699e33
feat: pull 'certificate-installation' image from the same mirror as f…
sitnik Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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
7 changes: 4 additions & 3 deletions mirroroperator/registrymirror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"}
Expand Down