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

chore(ci): remove imageStreams #282

Closed
wants to merge 1 commit into from
Closed

chore(ci): remove imageStreams #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 7 additions & 26 deletions .github/openshift/deploy.backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ parameters:
- name: INIT_IMAGE
description: Imaged used by the init process
value: flyway/flyway
- name: RANDOM_EXPRESSION
description: Random expression to make sure deployments update
from: "[a-zA-Z0-9]{32}"
generate: expression
objects:
- apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -95,22 +99,6 @@ objects:
ches-client-secret: "${CHES_CLIENT_SECRET}"
idir-form-password: "${IDIR_FORM_PASSWORD}"
bceid-form-password: "${BCEID_FORM_PASSWORD}"
- apiVersion: v1
kind: ImageStream
metadata:
labels:
app: ${NAME}-${ZONE}
name: ${NAME}-${ZONE}-${COMPONENT}
spec:
lookupPolicy:
local: false
tags:
- name: ${IMAGE_TAG}
from:
kind: DockerImage
name: ${REGISTRY}/${PROMOTE}
referencePolicy:
type: Local
- apiVersion: v1
kind: DeploymentConfig
metadata:
Expand All @@ -121,14 +109,6 @@ objects:
replicas: 1
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- ${NAME}
from:
kind: ImageStreamTag
name: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
selector:
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
strategy:
Expand Down Expand Up @@ -171,7 +151,7 @@ objects:
configMap:
name: postgres-configmap
containers:
- image: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
- image: ${REGISTRY}/${ORG}/${NAME}/${COMPONENT}:${ZONE}
imagePullPolicy: Always
name: ${NAME}
env:
Expand Down Expand Up @@ -239,7 +219,8 @@ objects:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: bceid-form-password

- name: RANDOM_EXPRESSION
value: ${RANDOM_EXPRESSION}
ports:
- containerPort: 3000
protocol: TCP
Expand Down
34 changes: 8 additions & 26 deletions .github/openshift/deploy.database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ parameters:
- name: PROMOTE
description: Image (namespace/name:tag) to promote/import
value: openshift/postgresql:12
- name: RANDOM_EXPRESSION
description: Random expression to make sure deployments update
from: "[a-zA-Z0-9]{32}"
generate: expression
objects:
- apiVersion: v1
kind: Secret
Expand All @@ -61,22 +65,6 @@ objects:
requests:
storage: "${DB_PVC_SIZE}"
storageClassName: netapp-file-standard
- kind: ImageStream
apiVersion: v1
metadata:
name: ${NAME}-${ZONE}-${COMPONENT}
labels:
app: ${NAME}-${ZONE}
spec:
lookupPolicy:
local: false
tags:
- name: ${IMAGE_TAG}
from:
kind: DockerImage
name: ${REGISTRY}/${PROMOTE}
referencePolicy:
type: Local
- kind: DeploymentConfig
apiVersion: v1
metadata:
Expand All @@ -87,14 +75,6 @@ objects:
replicas: 1
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- ${NAME}
from:
kind: ImageStreamTag
name: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
selector:
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
strategy:
Expand All @@ -115,7 +95,7 @@ objects:
claimName: ${NAME}-${ZONE}-${COMPONENT}
containers:
- name: ${NAME}
image: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
image: ${REGISTRY}/${PROMOTE}
ports:
- containerPort: 5432
protocol: TCP
Expand Down Expand Up @@ -161,6 +141,8 @@ objects:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: database-user
- name: RANDOM_EXPRESSION
value: ${RANDOM_EXPRESSION}
volumeMounts:
- name: ${NAME}-${ZONE}-${COMPONENT}
mountPath: "/var/lib/pgsql/data"
Expand Down Expand Up @@ -200,4 +182,4 @@ objects:
selector:
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
sessionAffinity: None
type: ClusterIP
type: ClusterIP
Loading