From 136df0be4c360a61c3db28b3c3b1a5367ddd2131 Mon Sep 17 00:00:00 2001 From: Jareth Whitney Date: Thu, 13 Feb 2025 15:37:54 -0800 Subject: [PATCH 1/2] feature/deseng761: Added old admin dev DeploymentConfig yaml (oc) and new admin dev Deployment yaml (Kubernetes). --- CHANGELOG.md | 3 + ...duseplanning-admin-dev-deployment-old.yaml | 228 ++++++++++++++++++ .../landuseplanning-admin-dev-deployment.yaml | 179 ++++++++++++++ package.json | 2 +- 4 files changed, 411 insertions(+), 1 deletion(-) create mode 100644 openshift/templates/lup-admin/landuseplanning-admin-dev-deployment-old.yaml create mode 100644 openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f70d743..4f6f41a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.12.2 Feb 13, 2025 +* Added old DeploymentConfig (OC) YAML and new Deployment (Kubernetes) YAML. [DESENG-761](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-761) + ### 1.12.1 Jan 15, 2025 * Fixed pagination and added duplicate filtering to permissions page/route. [DESENG-755](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-755) * Also associated with [DESENG-757](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-757) diff --git a/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment-old.yaml b/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment-old.yaml new file mode 100644 index 00000000..6e73ada1 --- /dev/null +++ b/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment-old.yaml @@ -0,0 +1,228 @@ +kind: DeploymentConfig +apiVersion: apps.openshift.io/v1 +metadata: + name: landuseplanning-admin-dev + namespace: e8b9ad-dev + uid: 9e818f60-50c1-46de-ae9a-4e6639d37241 + resourceVersion: '13256132504' + generation: 57 + creationTimestamp: '2021-02-19T23:09:08Z' + labels: + app: landuseplanning-admin-dev + app.kubernetes.io/component: landuseplanning-admin-dev + app.kubernetes.io/instance: landuseplanning-admin-dev + app.kubernetes.io/part-of: landuseplanning-admin-dev + managedFields: + - manager: Mozilla + operation: Update + apiVersion: apps.openshift.io/v1 + time: '2021-03-25T21:15:43Z' + fieldsType: FieldsV1 + fieldsV1: + 'f:metadata': + 'f:labels': + .: {} + 'f:app': {} + 'f:app.kubernetes.io/component': {} + 'f:app.kubernetes.io/instance': {} + 'f:app.kubernetes.io/part-of': {} + 'f:spec': + 'f:replicas': {} + 'f:selector': + .: {} + 'f:app': {} + 'f:strategy': + 'f:activeDeadlineSeconds': {} + 'f:rollingParams': + .: {} + 'f:intervalSeconds': {} + 'f:maxSurge': {} + 'f:maxUnavailable': {} + 'f:timeoutSeconds': {} + 'f:updatePeriodSeconds': {} + 'f:type': {} + 'f:template': + .: {} + 'f:metadata': + .: {} + 'f:creationTimestamp': {} + 'f:labels': + .: {} + 'f:app': {} + 'f:spec': + .: {} + 'f:containers': + .: {} + 'k:{"name":"landuseplanning-admin-dev"}': + .: {} + 'f:env': + .: {} + 'k:{"name":"API_URL"}': + .: {} + 'f:name': {} + 'f:value': {} + 'k:{"name":"DEPLOYMENT_ENVIRONMENT"}': + .: {} + 'f:name': {} + 'f:value': {} + 'k:{"name":"REMOTE_API_PATH"}': + .: {} + 'f:name': {} + 'f:value': {} + 'k:{"name":"REMOTE_PUBLIC_PATH"}': + .: {} + 'f:name': {} + 'f:value': {} + 'f:imagePullPolicy': {} + 'f:name': {} + 'f:ports': + .: {} + 'k:{"containerPort":8080,"protocol":"TCP"}': + .: {} + 'f:containerPort': {} + 'f:protocol': {} + 'f:resources': {} + 'f:terminationMessagePath': {} + 'f:terminationMessagePolicy': {} + 'f:dnsPolicy': {} + 'f:restartPolicy': {} + 'f:schedulerName': {} + 'f:securityContext': {} + 'f:terminationGracePeriodSeconds': {} + - manager: openshift-controller-manager + operation: Update + apiVersion: apps.openshift.io/v1 + time: '2025-01-17T01:13:32Z' + fieldsType: FieldsV1 + fieldsV1: + 'f:spec': + 'f:template': + 'f:spec': + 'f:containers': + 'k:{"name":"landuseplanning-admin-dev"}': + 'f:image': {} + 'f:triggers': {} + 'f:status': + 'f:conditions': + .: {} + 'k:{"type":"Available"}': + .: {} + 'f:type': {} + 'k:{"type":"Progressing"}': + .: {} + 'f:type': {} + 'f:details': {} + - manager: openshift-controller-manager + operation: Update + apiVersion: apps.openshift.io/v1 + time: '2025-02-13T23:22:02Z' + fieldsType: FieldsV1 + fieldsV1: + 'f:status': + 'f:availableReplicas': {} + 'f:conditions': + 'k:{"type":"Available"}': + 'f:lastTransitionTime': {} + 'f:lastUpdateTime': {} + 'f:message': {} + 'f:status': {} + 'k:{"type":"Progressing"}': + 'f:lastTransitionTime': {} + 'f:lastUpdateTime': {} + 'f:message': {} + 'f:reason': {} + 'f:status': {} + 'f:details': + 'f:causes': {} + 'f:message': {} + 'f:latestVersion': {} + 'f:observedGeneration': {} + 'f:replicas': {} + 'f:unavailableReplicas': {} + 'f:updatedReplicas': {} + subresource: status +spec: + strategy: + type: Rolling + rollingParams: + updatePeriodSeconds: 1 + intervalSeconds: 1 + timeoutSeconds: 600 + maxUnavailable: 25% + maxSurge: 25% + resources: {} + activeDeadlineSeconds: 21600 + triggers: + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - landuseplanning-admin-dev + from: + kind: ImageStreamTag + namespace: e8b9ad-tools + name: 'lup-admin-deploy-image:dev' + lastTriggeredImage: 'image-registry.openshift-image-registry.svc:5000/e8b9ad-tools/lup-admin-deploy-image@sha256:83d478b362264091a4b20e3df7a2f944d607ed2aba0fd247cca32fdcf567e454' + - type: ConfigChange + replicas: 0 + revisionHistoryLimit: 10 + test: false + selector: + app: landuseplanning-admin-dev + template: + metadata: + creationTimestamp: null + labels: + app: landuseplanning-admin-dev + spec: + containers: + - name: landuseplanning-admin-dev + image: 'image-registry.openshift-image-registry.svc:5000/e8b9ad-tools/lup-admin-deploy-image@sha256:83d478b362264091a4b20e3df7a2f944d607ed2aba0fd247cca32fdcf567e454' + ports: + - containerPort: 8080 + protocol: TCP + env: + - name: REMOTE_API_PATH + value: 'https://landuseplanning-dev.apps.silver.devops.gov.bc.ca/api' + - name: REMOTE_PUBLIC_PATH + value: 'https://landuseplanning-dev.apps.silver.devops.gov.bc.ca/' + - name: DEPLOYMENT_ENVIRONMENT + value: dev + - name: API_URL + value: 'https://landuseplanning-dev.apps.silver.devops.gov.bc.ca/api' + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler +status: + latestVersion: 49 + observedGeneration: 57 + replicas: 0 + updatedReplicas: 0 + availableReplicas: 0 + unavailableReplicas: 0 + details: + message: image change + causes: + - type: ImageChange + imageTrigger: + from: + kind: DockerImage + name: 'image-registry.openshift-image-registry.svc:5000/e8b9ad-tools/lup-admin-deploy-image@sha256:83d478b362264091a4b20e3df7a2f944d607ed2aba0fd247cca32fdcf567e454' + conditions: + - type: Progressing + status: 'True' + lastUpdateTime: '2025-01-17T01:15:23Z' + lastTransitionTime: '2025-01-17T01:15:16Z' + reason: NewReplicationControllerAvailable + message: replication controller "landuseplanning-admin-dev-49" successfully rolled out + - type: Available + status: 'False' + lastUpdateTime: '2025-02-13T23:22:02Z' + lastTransitionTime: '2025-02-13T23:22:02Z' + message: Deployment config does not have minimum availability. diff --git a/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml b/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml new file mode 100644 index 00000000..0d616171 --- /dev/null +++ b/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml @@ -0,0 +1,179 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: landuseplanning-admin-dev + namespace: e8b9ad-dev + labels: + app: landuseplanning-admin-dev + app.kubernetes.io/component: landuseplanning-admin-dev + app.kubernetes.io/instance: landuseplanning-admin-dev + app.kubernetes.io/part-of: landuseplanning-admin-dev + managedFields: + - manager: Mozilla + operation: Update + apiVersion: apps.openshift.io/v1 + time: '2021-03-25T21:15:43Z' + fieldsType: FieldsV1 + fieldsV1: + 'f:metadata': + 'f:labels': + .: {} + 'f:app': {} + 'f:app.kubernetes.io/component': {} + 'f:app.kubernetes.io/instance': {} + 'f:app.kubernetes.io/part-of': {} + 'f:spec': + 'f:replicas': {} + 'f:selector': + .: {} + 'f:app': {} + 'f:strategy': + 'f:activeDeadlineSeconds': {} + 'f:rollingParams': + .: {} + 'f:intervalSeconds': {} + 'f:maxSurge': {} + 'f:maxUnavailable': {} + 'f:timeoutSeconds': {} + 'f:updatePeriodSeconds': {} + 'f:type': {} + 'f:template': + .: {} + 'f:metadata': + .: {} + 'f:creationTimestamp': {} + 'f:labels': + .: {} + 'f:app': {} + 'f:spec': + .: {} + 'f:containers': + .: {} + 'k:{"name":"landuseplanning-admin-dev"}': + .: {} + 'f:env': + .: {} + 'k:{"name":"API_URL"}': + .: {} + 'f:name': {} + 'f:value': {} + 'k:{"name":"DEPLOYMENT_ENVIRONMENT"}': + .: {} + 'f:name': {} + 'f:value': {} + 'k:{"name":"REMOTE_API_PATH"}': + .: {} + 'f:name': {} + 'f:value': {} + 'k:{"name":"REMOTE_PUBLIC_PATH"}': + .: {} + 'f:name': {} + 'f:value': {} + 'f:imagePullPolicy': {} + 'f:name': {} + 'f:ports': + .: {} + 'k:{"containerPort":8080,"protocol":"TCP"}': + .: {} + 'f:containerPort': {} + 'f:protocol': {} + 'f:resources': {} + 'f:terminationMessagePath': {} + 'f:terminationMessagePolicy': {} + 'f:dnsPolicy': {} + 'f:restartPolicy': {} + 'f:schedulerName': {} + 'f:securityContext': {} + 'f:terminationGracePeriodSeconds': {} + - manager: openshift-controller-manager + operation: Update + apiVersion: apps.openshift.io/v1 + time: '2025-01-17T01:13:32Z' + fieldsType: FieldsV1 + fieldsV1: + 'f:spec': + 'f:template': + 'f:spec': + 'f:containers': + 'k:{"name":"landuseplanning-admin-dev"}': + 'f:image': {} + 'f:triggers': {} + 'f:status': + 'f:conditions': + .: {} + 'k:{"type":"Available"}': + .: {} + 'f:type': {} + 'k:{"type":"Progressing"}': + .: {} + 'f:type': {} + 'f:details': {} + - manager: openshift-controller-manager + operation: Update + apiVersion: apps.openshift.io/v1 + time: '2025-02-13T18:57:26Z' + fieldsType: FieldsV1 + fieldsV1: + 'f:status': + 'f:updatedReplicas': {} + 'f:readyReplicas': {} + 'f:conditions': + 'k:{"type":"Available"}': + 'f:lastTransitionTime': {} + 'f:lastUpdateTime': {} + 'f:message': {} + 'f:status': {} + 'k:{"type":"Progressing"}': + 'f:lastTransitionTime': {} + 'f:lastUpdateTime': {} + 'f:message': {} + 'f:reason': {} + 'f:status': {} + 'f:details': + 'f:causes': {} + 'f:message': {} + 'f:replicas': {} + 'f:availableReplicas': {} + 'f:observedGeneration': {} + 'f:unavailableReplicas': {} + 'f:latestVersion': {} + subresource: status +spec: + strategy: + type: RollingUpdate + replicas: 2 + revisionHistoryLimit: 10 + selector: + matchLabels: + app: landuseplanning-admin-dev + template: + metadata: + creationTimestamp: null + labels: + app: landuseplanning-admin-dev + spec: + containers: + - name: landuseplanning-admin-dev + image: image-registry.apps.silver.devops.gov.bc.ca/e8b9ad-tools/lup-admin-deploy-image + ports: + - containerPort: 8080 + protocol: TCP + env: + - name: REMOTE_API_PATH + value: 'https://landuseplanning-dev.apps.silver.devops.gov.bc.ca/api' + - name: REMOTE_PUBLIC_PATH + value: 'https://landuseplanning-dev.apps.silver.devops.gov.bc.ca/' + - name: DEPLOYMENT_ENVIRONMENT + value: dev + - name: API_URL + value: 'https://landuseplanning-dev.apps.silver.devops.gov.bc.ca/api' + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler + \ No newline at end of file diff --git a/package.json b/package.json index d47053e5..e4cbdceb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "landuseplanning-admin", - "version": "1.12.1", + "version": "1.12.2", "license": "Apache-2.0", "scripts": { "ng": "ng", From e509d8a09c445b32d832a1fd8d2db18a9b6e2890 Mon Sep 17 00:00:00 2001 From: Jareth Whitney Date: Thu, 13 Feb 2025 16:51:45 -0800 Subject: [PATCH 2/2] feature/deseng761: Removed managedFields from new Deployment yaml. --- .../landuseplanning-admin-dev-deployment.yaml | 130 ------------------ 1 file changed, 130 deletions(-) diff --git a/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml b/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml index 0d616171..ce7e1254 100644 --- a/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml +++ b/openshift/templates/lup-admin/landuseplanning-admin-dev-deployment.yaml @@ -8,136 +8,6 @@ metadata: app.kubernetes.io/component: landuseplanning-admin-dev app.kubernetes.io/instance: landuseplanning-admin-dev app.kubernetes.io/part-of: landuseplanning-admin-dev - managedFields: - - manager: Mozilla - operation: Update - apiVersion: apps.openshift.io/v1 - time: '2021-03-25T21:15:43Z' - fieldsType: FieldsV1 - fieldsV1: - 'f:metadata': - 'f:labels': - .: {} - 'f:app': {} - 'f:app.kubernetes.io/component': {} - 'f:app.kubernetes.io/instance': {} - 'f:app.kubernetes.io/part-of': {} - 'f:spec': - 'f:replicas': {} - 'f:selector': - .: {} - 'f:app': {} - 'f:strategy': - 'f:activeDeadlineSeconds': {} - 'f:rollingParams': - .: {} - 'f:intervalSeconds': {} - 'f:maxSurge': {} - 'f:maxUnavailable': {} - 'f:timeoutSeconds': {} - 'f:updatePeriodSeconds': {} - 'f:type': {} - 'f:template': - .: {} - 'f:metadata': - .: {} - 'f:creationTimestamp': {} - 'f:labels': - .: {} - 'f:app': {} - 'f:spec': - .: {} - 'f:containers': - .: {} - 'k:{"name":"landuseplanning-admin-dev"}': - .: {} - 'f:env': - .: {} - 'k:{"name":"API_URL"}': - .: {} - 'f:name': {} - 'f:value': {} - 'k:{"name":"DEPLOYMENT_ENVIRONMENT"}': - .: {} - 'f:name': {} - 'f:value': {} - 'k:{"name":"REMOTE_API_PATH"}': - .: {} - 'f:name': {} - 'f:value': {} - 'k:{"name":"REMOTE_PUBLIC_PATH"}': - .: {} - 'f:name': {} - 'f:value': {} - 'f:imagePullPolicy': {} - 'f:name': {} - 'f:ports': - .: {} - 'k:{"containerPort":8080,"protocol":"TCP"}': - .: {} - 'f:containerPort': {} - 'f:protocol': {} - 'f:resources': {} - 'f:terminationMessagePath': {} - 'f:terminationMessagePolicy': {} - 'f:dnsPolicy': {} - 'f:restartPolicy': {} - 'f:schedulerName': {} - 'f:securityContext': {} - 'f:terminationGracePeriodSeconds': {} - - manager: openshift-controller-manager - operation: Update - apiVersion: apps.openshift.io/v1 - time: '2025-01-17T01:13:32Z' - fieldsType: FieldsV1 - fieldsV1: - 'f:spec': - 'f:template': - 'f:spec': - 'f:containers': - 'k:{"name":"landuseplanning-admin-dev"}': - 'f:image': {} - 'f:triggers': {} - 'f:status': - 'f:conditions': - .: {} - 'k:{"type":"Available"}': - .: {} - 'f:type': {} - 'k:{"type":"Progressing"}': - .: {} - 'f:type': {} - 'f:details': {} - - manager: openshift-controller-manager - operation: Update - apiVersion: apps.openshift.io/v1 - time: '2025-02-13T18:57:26Z' - fieldsType: FieldsV1 - fieldsV1: - 'f:status': - 'f:updatedReplicas': {} - 'f:readyReplicas': {} - 'f:conditions': - 'k:{"type":"Available"}': - 'f:lastTransitionTime': {} - 'f:lastUpdateTime': {} - 'f:message': {} - 'f:status': {} - 'k:{"type":"Progressing"}': - 'f:lastTransitionTime': {} - 'f:lastUpdateTime': {} - 'f:message': {} - 'f:reason': {} - 'f:status': {} - 'f:details': - 'f:causes': {} - 'f:message': {} - 'f:replicas': {} - 'f:availableReplicas': {} - 'f:observedGeneration': {} - 'f:unavailableReplicas': {} - 'f:latestVersion': {} - subresource: status spec: strategy: type: RollingUpdate