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.

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

Add IMAGE_PULL_SECRET parameter #370

Merged
merged 2 commits into from
Feb 20, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Add an image pull secret parameter
This is provided to the orchestrator as an image pull secret and
also as an environment variable so that it can deploy the worker
containers with the same secret.

ManageIQ/manageiq#19699
  • Loading branch information
carbonin committed Feb 20, 2020
commit 05c892c9f48496e2d5000b9a02427873bcc725d0
3 changes: 3 additions & 0 deletions parameters
Original file line number Diff line number Diff line change
@@ -38,6 +38,9 @@ HTTPD_IMAGE_TAG=latest
HTTPD_MEM_LIMIT=8192Mi
HTTPD_MEM_REQ=512Mi

# Image pull secret to use for the orchestrator and worker images
#IMAGE_PULL_SECRET=

# memcached pod deployment information
MEMCACHED_CPU_REQ=200m
MEMCACHED_IMAGE_NAME=manageiq/memcached
6 changes: 6 additions & 0 deletions templates/app/orchestrator.yaml
Original file line number Diff line number Diff line change
@@ -75,12 +75,16 @@ objects:
key: encryption-key
- name: CONTAINER_IMAGE_NAMESPACE
value: "${ORCHESTRATOR_IMAGE_NAMESPACE}"
- name: IMAGE_PULL_SECRET
value: "${IMAGE_PULL_SECRET}"
resources:
requests:
memory: "${ORCHESTRATOR_MEM_REQ}"
cpu: "${ORCHESTRATOR_CPU_REQ}"
limits:
memory: "${ORCHESTRATOR_MEM_LIMIT}"
imagePullSecrets:
- name: "${IMAGE_PULL_SECRET}"
serviceAccountName: "${APP_NAME}-orchestrator"
terminationGracePeriodSeconds: 90
parameters:
@@ -93,6 +97,8 @@ parameters:
- name: GUID
from: "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"
generate: expression
- name: IMAGE_PULL_SECRET
value: ''
- name: ORCHESTRATOR_IMAGE_NAMESPACE
value: manageiq
- name: ORCHESTRATOR_IMAGE_NAME