From 159be0861c26b4bda47fd1e279b697c1b0fb6ef1 Mon Sep 17 00:00:00 2001 From: "lco-deploy-bot[bot]" <150841564+lco-deploy-bot[bot]@users.noreply.github.com> Date: Tue, 12 May 2026 10:43:52 +0000 Subject: [PATCH] staging: Merge pull request [#285](https://github.com/LCOGT/mop/issues/285) from LCOGT/s3-storages-setting Source-commit: https://github.com/LCOGT/mop/commit/9c408d0583a140baf1c8a48fde2bd6224ce7667b use new settings syntax to configure S3 file storage Co-authored-by: Rachel Street <10391660+rachel3834@users.noreply.github.com> Co-authored-by: GitHub --- 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 32041e1..c02e9ee 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.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default ports: - containerPort: 8080 @@ -274,7 +274,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 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.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: django-collectstatic resources: limits: @@ -463,7 +463,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -564,7 +564,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -664,7 +664,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -765,7 +765,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -866,7 +866,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -968,7 +968,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -1069,7 +1069,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: @@ -1171,7 +1171,7 @@ spec: - secretRef: name: tsn-26bc5hg2gb optional: false - image: ghcr.io/lcogt/mop/mop:5.3.8-2-gaff54c1@sha256:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 + image: ghcr.io/lcogt/mop/mop:5.3.9-2-g9c408d0@sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: default securityContext: capabilities: diff --git a/staging/base/Kptfile b/staging/base/Kptfile index f68ab14..d317895 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: aff54c1a571a3a42238a91b977bc63f2b6d0a92e + ref: 9c408d0583a140baf1c8a48fde2bd6224ce7667b updateStrategy: resource-merge upstreamLock: type: git git: repo: https://github.com/LCOGT/mop directory: /k8s/base - ref: aff54c1a571a3a42238a91b977bc63f2b6d0a92e - commit: aff54c1a571a3a42238a91b977bc63f2b6d0a92e + ref: 9c408d0583a140baf1c8a48fde2bd6224ce7667b + commit: 9c408d0583a140baf1c8a48fde2bd6224ce7667b diff --git a/staging/cd-set-images/kustomization.yaml b/staging/cd-set-images/kustomization.yaml index ea55348..b2d5ece 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:e304696b34bdd93a74ff2588b46bf4c04b768100891a77635a10f3cef86cafe7 +- digest: sha256:44fd6e244039fb190ab9459e7b074a1f7b73f4b5bbc7735ca97ba04633c33b97 name: mop newName: ghcr.io/lcogt/mop/mop - newTag: 5.3.8-2-gaff54c1 + newTag: 5.3.9-2-g9c408d0