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

fix: Revert "chore(ci): deployment config deprecation" #171

Merged
merged 3 commits into from
Sep 10, 2024
Merged

fix: Revert "chore(ci): deployment config deprecation" #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3384e8
Revert "chore(ci): deployment config deprecation (#170)"
DerekRoberts Sep 10, 2024
a2f2bfc
Merge branch 'main' into revert-170-chore/ci/deprecateDeploymentConfigs
DerekRoberts Sep 10, 2024
748ff04
Merge branch 'main' into revert-170-chore/ci/deprecateDeploymentConfigs
DerekRoberts Sep 10, 2024
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
25 changes: 17 additions & 8 deletions frontend/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,33 @@ objects:
name: ${REGISTRY}/${PROMOTE}
referencePolicy:
type: Local
- apiVersion: apps/v1
kind: Deployment
- apiVersion: v1
kind: DeploymentConfig
metadata:
labels:
app: ${NAME}-${ZONE}
name: ${NAME}-${ZONE}-${COMPONENT}
spec:
replicas: 1
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- ${NAME}
from:
kind: ImageStreamTag
name: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
selector:
matchLabels:
deployment: ${NAME}-${ZONE}-${COMPONENT}
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
strategy:
type: RollingUpdate
type: Rolling
template:
metadata:
labels:
app: ${NAME}-${ZONE}
deployment: ${NAME}-${ZONE}-${COMPONENT}
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
spec:
containers:
- image: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
Expand Down Expand Up @@ -156,7 +165,7 @@ objects:
port: 80
targetPort: 3000
selector:
deployment: ${NAME}-${ZONE}-${COMPONENT}
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}

- apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
Expand All @@ -165,7 +174,7 @@ objects:
spec:
scaleTargetRef:
apiVersion: apps.openshift.io/v1
kind: Deployment
kind: DeploymentConfig
name: ${NAME}-${ZONE}-${COMPONENT}
minReplicas: ${{MIN_REPLICAS}}
maxReplicas: ${{MAX_REPLICAS}}
Expand Down
25 changes: 17 additions & 8 deletions frontend/openshift.nginx.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,33 @@ objects:
name: ${REGISTRY}/${PROMOTE}
referencePolicy:
type: Local
- apiVersion: apps/v1
kind: Deployment
- apiVersion: v1
kind: DeploymentConfig
metadata:
labels:
app: ${NAME}-${ZONE}
name: ${NAME}-${ZONE}-${COMPONENT}
spec:
replicas: 1
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- ${NAME}
from:
kind: ImageStreamTag
name: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
selector:
matchLabels:
deployment: ${NAME}-${ZONE}-${COMPONENT}
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
strategy:
type: RollingUpdate
type: Rolling
template:
metadata:
labels:
app: ${NAME}-${ZONE}
deployment: ${NAME}-${ZONE}-${COMPONENT}
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
spec:
containers:
- image: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
Expand Down Expand Up @@ -123,7 +132,7 @@ objects:
port: 80
targetPort: 3000
selector:
deployment: ${NAME}-${ZONE}-${COMPONENT}
deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
- apiVersion: route.openshift.io/v1
kind: Route
metadata:
Expand All @@ -148,7 +157,7 @@ objects:
spec:
scaleTargetRef:
apiVersion: apps.openshift.io/v1
kind: Deployment
kind: DeploymentConfig
name: ${NAME}-${ZONE}-${COMPONENT}
minReplicas: ${{MIN_REPLICAS}}
maxReplicas: ${{MAX_REPLICAS}}
Expand Down
Loading