Skip to content

Commit

Permalink
Merge pull request #208 from bcgov/main
Browse files Browse the repository at this point in the history
refactor: changed bcsc flow to account for 3rd party fe
  • Loading branch information
AdvSol-Darrel authored Dec 6, 2024
2 parents dc89958 + aa946f6 commit 34815e8
Show file tree
Hide file tree
Showing 13 changed files with 850 additions and 44 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/zap-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
description: The Target URL
options:
- https://bc-emli-pin-mgmt-be-c82b4c-dev.apps.silver.devops.gov.bc.ca/
- https://bc-emli-pin-mgmt-fe-c82b4c-dev.apps.silver.devops.gov.bc.ca/home
- https://bc-emli-pin-mgmt-be-c82b4c-test.apps.silver.devops.gov.bc.ca/
- https://bc-emli-pin-mgmt-prod-be.apps.silver.devops.gov.bc.ca/

jobs:
zap-scan:
Expand Down
113 changes: 113 additions & 0 deletions openshift/tools/clamav-dc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","metadata":{"annotations":{},"generation":1,"labels":{"app":"clamav"},"name":"clamav","namespace":"c82b4c-tools"},"spec":{"replicas":1,"selector":{"app":"clamav","deploymentconfig":"clamav"},"strategy":{"activeDeadlineSeconds":21600,"type":"Rolling"},"template":{"metadata":{"annotations":{"openshift.io/generated-by":"OpenShiftWebConsole"},"labels":{"app":"clamav","deploymentconfig":"clamav"}},"spec":{"containers":[{"image":"clamav-prod:dev","imagePullPolicy":"Always","livenessProbe":{"failureThreshold":3,"initialDelaySeconds":240,"periodSeconds":10,"successThreshold":1,"tcpSocket":{"port":3310},"timeoutSeconds":3},"name":"clamav","ports":[{"containerPort":3310,"protocol":"TCP"}],"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":240,"periodSeconds":10,"successThreshold":1,"tcpSocket":{"port":3310},"timeoutSeconds":3},"resources":{"limits":{"cpu":"1100m","memory":"2G"},"requests":{"cpu":"100m","memory":"500M"}},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File"}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":30}},"test":false,"triggers":[{"imageChangeParams":{"automatic":true,"containerNames":["clamav"],"from":{"kind":"ImageStreamTag","name":"clamav-prod:dev"}},"type":"ImageChange"},{"type":"ConfigChange"}]}}
creationTimestamp: "2023-12-05T03:58:20Z"
generation: 5
labels:
app: clamav
name: clamav
namespace: c82b4c-tools
resourceVersion: "12445541918"
uid: 00cb6ab0-9418-4292-9e2d-0f8ab0633de0
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
app: clamav
deploymentconfig: clamav
strategy:
activeDeadlineSeconds: 21600
resources: {}
rollingParams:
intervalSeconds: 1
maxSurge: 25%
maxUnavailable: 25%
timeoutSeconds: 600
updatePeriodSeconds: 1
type: Rolling
template:
metadata:
annotations:
openshift.io/generated-by: OpenShiftWebConsole
creationTimestamp: null
labels:
app: clamav
deploymentconfig: clamav
spec:
containers:
- image: image-registry.openshift-image-registry.svc:5000/c82b4c-tools/clamav-prod@sha256:d6bf226eb34f7095c022e66d2882229f2eada38d515bc4c12a218253a2af920c
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
initialDelaySeconds: 240
periodSeconds: 10
successThreshold: 1
tcpSocket:
port: 3310
timeoutSeconds: 3
name: clamav
ports:
- containerPort: 3310
protocol: TCP
readinessProbe:
failureThreshold: 3
initialDelaySeconds: 240
periodSeconds: 10
successThreshold: 1
tcpSocket:
port: 3310
timeoutSeconds: 3
resources:
limits:
cpu: 1100m
memory: 2G
requests:
cpu: 100m
memory: 500M
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
terminationGracePeriodSeconds: 30
test: false
triggers:
- imageChangeParams:
automatic: true
containerNames:
- clamav
from:
kind: ImageStreamTag
name: clamav-prod:dev
namespace: c82b4c-tools
lastTriggeredImage: image-registry.openshift-image-registry.svc:5000/c82b4c-tools/clamav-prod@sha256:d6bf226eb34f7095c022e66d2882229f2eada38d515bc4c12a218253a2af920c
type: ImageChange
- type: ConfigChange
status:
availableReplicas: 1
conditions:
- lastTransitionTime: "2023-12-05T23:48:19Z"
lastUpdateTime: "2023-12-05T23:48:19Z"
message: replication controller "clamav-1" successfully rolled out
reason: NewReplicationControllerAvailable
status: "True"
type: Progressing
- lastTransitionTime: "2024-12-03T21:03:04Z"
lastUpdateTime: "2024-12-03T21:03:04Z"
message: Deployment config has minimum availability.
status: "True"
type: Available
details:
causes:
- type: ConfigChange
message: config change
latestVersion: 1
observedGeneration: 5
readyReplicas: 1
replicas: 1
unavailableReplicas: 0
updatedReplicas: 1
59 changes: 59 additions & 0 deletions openshift/tools/clamav-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: clamav
namespace: c82b4c-tools
labels:
app: clamav
annotations:
openshift.io/generated-by: OpenShiftWebConsole
spec:
replicas: 1
selector:
matchLabels:
app: clamav
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
template:
metadata:
labels:
app: clamav
spec:
containers:
- name: clamav
image: image-registry.openshift-image-registry.svc:5000/c82b4c-tools/clamav-prod@sha256:d6bf226eb34f7095c022e66d2882229f2eada38d515bc4c12a218253a2af920c
imagePullPolicy: Always
ports:
- containerPort: 3310
protocol: TCP
livenessProbe:
tcpSocket:
port: 3310
initialDelaySeconds: 240
periodSeconds: 10
timeoutSeconds: 3
successThreshold: 1
failureThreshold: 3
readinessProbe:
tcpSocket:
port: 3310
initialDelaySeconds: 240
periodSeconds: 10
timeoutSeconds: 3
successThreshold: 1
failureThreshold: 3
resources:
limits:
cpu: 1100m
memory: 2G
requests:
cpu: 100m
memory: 500M
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30
147 changes: 147 additions & 0 deletions openshift/tools/metabase-dc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","metadata":{"annotations":{},"labels":{"app":"metabase","app.kubernetes.io/component":"metabase","app.kubernetes.io/instance":"metabase","app.kubernetes.io/managed-by":"template","app.kubernetes.io/name":"java","app.kubernetes.io/part-of":"metabase","template":"metabase-dc-template"},"name":"metabase","namespace":"c82b4c-tools"},"spec":{"replicas":1,"revisionHistoryLimit":10,"selector":{"app":"metabase","deploymentconfig":"metabase"},"strategy":{"resources":{},"type":"Recreate"},"template":{"metadata":{"labels":{"app":"metabase","deploymentconfig":"metabase"},"name":"metabase"},"spec":{"containers":[{"env":[{"name":"MB_DB_FILE","value":"/app/data/metabase.db"},{"name":"MB_DB_TYPE","value":"h2"},{"name":"MB_ENCRYPTION_SECRET_KEY","valueFrom":{"secretKeyRef":{"key":"database-password","name":"metabase-secret"}}},{"name":"MB_JETTY_HOST","value":"0.0.0.0"},{"name":"MB_PASSWORD_COMPLEXITY","value":"strong"}],"image":"image-registry.openshift-image-registry.svc:5000/c82b4c-tools/metabase:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"tcpSocket":{"port":3000},"timeoutSeconds":1},"name":"metabase","ports":[{"containerPort":3000,"protocol":"TCP"}],"readinessProbe":{"failureThreshold":3,"httpGet":{"path":"/","port":3000},"initialDelaySeconds":10,"timeoutSeconds":1},"resources":{"limits":{"cpu":"500m","memory":"1.5Gi"},"requests":{"cpu":"50m","memory":"768Mi"}},"startupProbe":{"failureThreshold":12,"tcpSocket":{"port":3000},"timeoutSeconds":1},"volumeMounts":[{"mountPath":"/app/data","name":"data"}]}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","volumes":[{"name":"data","persistentVolumeClaim":{"claimName":"metabase"}}]}},"test":false,"triggers":[{"type":"ConfigChange"},{"imageChangeParams":{"automatic":true,"containerNames":["metabase"],"from":{"kind":"ImageStreamTag","name":"metabase:latest","namespace":"c82b4c-tools"}},"type":"ImageChange"}]}}
creationTimestamp: "2023-12-01T17:09:26Z"
generation: 6
labels:
app: metabase
app.kubernetes.io/component: metabase
app.kubernetes.io/instance: metabase
app.kubernetes.io/managed-by: template
app.kubernetes.io/name: java
app.kubernetes.io/part-of: metabase
template: metabase-dc-template
name: metabase
namespace: c82b4c-tools
resourceVersion: "12455589376"
uid: 431b4be1-fe05-404c-8ef6-baa4ac41c5cd
spec:
replicas: 0
revisionHistoryLimit: 10
selector:
app: metabase
deploymentconfig: metabase
strategy:
activeDeadlineSeconds: 21600
recreateParams:
timeoutSeconds: 600
resources: {}
type: Recreate
template:
metadata:
creationTimestamp: null
labels:
app: metabase
deploymentconfig: metabase
name: metabase
spec:
containers:
- env:
- name: MB_DB_FILE
value: /app/data/metabase.db
- name: MB_DB_TYPE
value: h2
- name: MB_ENCRYPTION_SECRET_KEY
valueFrom:
secretKeyRef:
key: database-password
name: metabase-secret
- name: MB_JETTY_HOST
value: 0.0.0.0
- name: MB_PASSWORD_COMPLEXITY
value: strong
image: image-registry.openshift-image-registry.svc:5000/c82b4c-tools/metabase@sha256:20872f1178bd03bdf7aff90e742b6e524467cd9bf95d834a2fa944c7ebc21eae
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
tcpSocket:
port: 3000
timeoutSeconds: 1
name: metabase
ports:
- containerPort: 3000
protocol: TCP
readinessProbe:
failureThreshold: 3
httpGet:
path: /
port: 3000
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
resources:
limits:
cpu: 500m
memory: 1536Mi
requests:
cpu: 50m
memory: 768Mi
startupProbe:
failureThreshold: 12
periodSeconds: 10
successThreshold: 1
tcpSocket:
port: 3000
timeoutSeconds: 1
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /app/data
name: data
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
terminationGracePeriodSeconds: 30
volumes:
- name: data
persistentVolumeClaim:
claimName: metabase
test: false
triggers:
- type: ConfigChange
- imageChangeParams:
automatic: true
containerNames:
- metabase
from:
kind: ImageStreamTag
name: metabase:latest
namespace: c82b4c-tools
lastTriggeredImage: image-registry.openshift-image-registry.svc:5000/c82b4c-tools/metabase@sha256:20872f1178bd03bdf7aff90e742b6e524467cd9bf95d834a2fa944c7ebc21eae
type: ImageChange
status:
availableReplicas: 0
conditions:
- lastTransitionTime: "2023-12-01T22:05:24Z"
lastUpdateTime: "2023-12-01T22:06:31Z"
message: replication controller "metabase-2" successfully rolled out
reason: NewReplicationControllerAvailable
status: "True"
type: Progressing
- lastTransitionTime: "2024-12-04T18:22:08Z"
lastUpdateTime: "2024-12-04T18:22:08Z"
message: Deployment config does not have minimum availability.
status: "False"
type: Available
details:
causes:
- imageTrigger:
from:
kind: DockerImage
name: image-registry.openshift-image-registry.svc:5000/c82b4c-tools/metabase@sha256:20872f1178bd03bdf7aff90e742b6e524467cd9bf95d834a2fa944c7ebc21eae
type: ImageChange
message: image change
latestVersion: 2
observedGeneration: 6
replicas: 0
unavailableReplicas: 0
updatedReplicas: 0
Loading

0 comments on commit 34815e8

Please sign in to comment.