From fcb7bcad501e2b8c21ff5dcc8a7673da2ac09c3e Mon Sep 17 00:00:00 2001 From: "lco-deploy-bot[bot]" <150841564+lco-deploy-bot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 14:29:14 +0000 Subject: [PATCH] staging: Merge branch 'dev' Source-commit: https://github.com/LCOGT/mop/commit/193fb97ddfc718a1755233849b1a23f0108cc818 Co-authored-by: Rachel Street <10391660+rachel3834@users.noreply.github.com> --- output/staging/manifest.yaml | 22 +++++++++++----------- staging/base/Kptfile | 6 +++--- staging/cd-set-images/kustomization.yaml | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/output/staging/manifest.yaml b/output/staging/manifest.yaml index 709e92a..4011b0b 100644 --- a/output/staging/manifest.yaml +++ b/output/staging/manifest.yaml @@ -118,7 +118,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default ports: - containerPort: 8080 @@ -274,7 +274,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: apply-db-migrations resources: limits: @@ -337,7 +337,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: django-collectstatic resources: limits: @@ -463,7 +463,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -564,7 +564,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -664,7 +664,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -765,7 +765,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -866,7 +866,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -968,7 +968,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -1069,7 +1069,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: @@ -1171,7 +1171,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.11-19-g60c8269@sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 + image: ghcr.io/lcogt/mop/mop:5.4.0-2-g193fb97@sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: default securityContext: capabilities: diff --git a/staging/base/Kptfile b/staging/base/Kptfile index b4f7e67..04b33a6 100644 --- a/staging/base/Kptfile +++ b/staging/base/Kptfile @@ -7,12 +7,12 @@ upstream: git: repo: https://github.com/LCOGT/mop directory: /k8s/base - ref: 60c8269cdca7cb57125db5d2298dd95ee1853333 + ref: 193fb97ddfc718a1755233849b1a23f0108cc818 updateStrategy: resource-merge upstreamLock: type: git git: repo: https://github.com/LCOGT/mop directory: /k8s/base - ref: 60c8269cdca7cb57125db5d2298dd95ee1853333 - commit: 60c8269cdca7cb57125db5d2298dd95ee1853333 + ref: 193fb97ddfc718a1755233849b1a23f0108cc818 + commit: 193fb97ddfc718a1755233849b1a23f0108cc818 diff --git a/staging/cd-set-images/kustomization.yaml b/staging/cd-set-images/kustomization.yaml index 40c0453..7284c5e 100644 --- a/staging/cd-set-images/kustomization.yaml +++ b/staging/cd-set-images/kustomization.yaml @@ -5,7 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component images: -- digest: sha256:24be0b6c5e563eac8943ed68b8c5e2b75ab1d8ba06ea96094fbbd3ca417bad31 +- digest: sha256:2a2ada4ee75139c4776d081e0a49ddbaf93f394659af7f2e4a8ca7d99edef7e7 name: mop newName: ghcr.io/lcogt/mop/mop - newTag: 5.3.11-19-g60c8269 + newTag: 5.4.0-2-g193fb97