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

Add IMAGE_PULL_SECRET parameter #370

Merged
merged 2 commits into from
Feb 20, 2020
Merged

Add IMAGE_PULL_SECRET parameter #370

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
485711b
Rename the orchestrator to not include the app name
carbonin Feb 19, 2020
05c892c
Add an image pull secret parameter
carbonin Feb 19, 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
3 changes: 3 additions & 0 deletions parameters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions templates/app/orchestrator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Template
metadata:
name: "${APP_NAME}-orchestrator"
name: orchestrator
objects:
- apiVersion: apps/v1
kind: Deployment
metadata:
name: "${APP_NAME}-orchestrator"
name: orchestrator
labels:
app: "${APP_NAME}"
spec:
Expand All @@ -15,15 +15,15 @@ objects:
replicas: 1
selector:
matchLabels:
name: "${APP_NAME}-orchestrator"
name: orchestrator
template:
metadata:
name: "${APP_NAME}-orchestrator"
name: orchestrator
labels:
name: "${APP_NAME}-orchestrator"
name: orchestrator
spec:
containers:
- name: "${APP_NAME}-orchestrator"
- name: orchestrator
image: "${ORCHESTRATOR_IMAGE_NAMESPACE}/${ORCHESTRATOR_IMAGE_NAME}:${ORCHESTRATOR_IMAGE_TAG}"
livenessProbe:
exec:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down