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

#3685 - Convert SIMS Web to deployment object #4210

Merged
merged 2 commits into from
Jan 8, 2025
Merged

#3685 - Convert SIMS Web to deployment object #4210

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
9b7e32b
Convert deployment config to deployment
dheepak-aot Jan 4, 2025
a6e2bdb
rollout command updated to use deployment
dheepak-aot Jan 7, 2025
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 devops/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ deploy-web:
-p TLS_KEY=$(TLS_KEY) \
-p TLS_CA_CERTIFICATE=$(TLS_CA_CERTIFICATE) \
| oc -n $(NAMESPACE) apply -f -
$(call rollout_and_wait,dc/$(WEB))
$(call rollout_and_wait,deployment/$(WEB))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


create-qa-api-db:
test -n $(QA_DB_NAME)
Expand Down
21 changes: 12 additions & 9 deletions devops/openshift/web-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@ labels:
project: ${PROJECT}
service: ${SERVICE_NAME}
objects:
- apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
- apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: ${NAME}
name: ${NAME}
spec:
replicas: "${{REPLICAS}}"
revisionHistoryLimit: 10
selector:
deploymentconfig: ${NAME}
matchLabels:
app: ${NAME}
strategy:
type: Rolling
type: RollingUpdate
template:
metadata:
labels:
deploymentconfig: ${NAME}
app: ${NAME}
spec:
containers:
- env:
Expand Down Expand Up @@ -69,7 +72,7 @@ objects:
port: 80
targetPort: ${{PORT}}
selector:
deploymentconfig: ${NAME}
app: ${NAME}
type: ClusterIP
- apiVersion: route.openshift.io/v1
kind: Route
Expand Down Expand Up @@ -107,8 +110,8 @@ objects:
name: ${NAME}-hpa
spec:
scaleTargetRef:
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
apiVersion: apps/v1
kind: Deployment
name: ${NAME}
minReplicas: "${{REPLICAS}}"
maxReplicas: 10
Expand All @@ -132,7 +135,7 @@ objects:
spec:
selector:
matchLabels:
deploymentconfig: ${NAME}
app: ${NAME}
maxUnavailable: 1
parameters:
- name: NAME
Expand Down
Loading