Skip to content

staging: Merge branch 'dev' #62

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

Merged
lco-deploy-bot merged 1 commit into from
Jul 14, 2026
Merged

staging: Merge branch 'dev' #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions output/staging/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions staging/base/Kptfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions staging/cd-set-images/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading