Skip to content

Merge jsonnet changes to main #5349

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
joe-elliott merged 1 commit into from
Jul 2, 2025
Merged

Merge jsonnet changes to main #5349

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
7 changes: 7 additions & 0 deletions operations/jsonnet-compiled/StatefulSet-memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,12 @@ spec:
ports:
- containerPort: 9150
name: http-metrics
resources:
limits:
cpu: 500m
memory: 250Mi
requests:
cpu: 50m
memory: 50Mi
updateStrategy:
type: RollingUpdate
10 changes: 5 additions & 5 deletions operations/jsonnet-compiled/util/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "ksonnet-util"
}
},
"version": "c014522d7d2c9ccba70556ec75a31cdde8907fe1",
"version": "b60cf9f5519cd038861780b07c58ce3f25646451",
"sum": "0y3AFX9LQSpfWTxWKSwoLgbt0Wc9nnCwhMH2szKzHv0="
},
{
Expand All @@ -18,8 +18,8 @@
"subdir": "memcached"
}
},
"version": "c014522d7d2c9ccba70556ec75a31cdde8907fe1",
"sum": "Cc715Y3rgTuimgDFIw+FaKzXSJGRYwt1pFTMbdrNBD8="
"version": "b60cf9f5519cd038861780b07c58ce3f25646451",
"sum": "Dw7gGDdAUa/RuWJmeKOmkldpIe8Y3XwgFGnPlhzdlJ8="
},
{
"source": {
Expand All @@ -28,8 +28,8 @@
"subdir": "1.29"
}
},
"version": "84aed0f9591ba86a3035e7ebe3557cb012039890",
"sum": "i2w3hGbgQmaB73t5LJHSioPOVdYv8ZBvivHiDwZJVyI="
"version": "14aa0545f3b789c3fa4ffe19ef9709ec5fa8c147",
"sum": "rD6FKvLBJtT+gRJDOz6z8iUzvjf/BiH8vdkyIcZMsno="
},
{
"source": {
Expand Down
8 changes: 7 additions & 1 deletion ...sonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/memcached/memcached.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...il/vendor/github.com/jsonnet-libs/k8s-libsonnet/1.29/_gen/meta/v1/deleteOptions.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../util/vendor/github.com/jsonnet-libs/k8s-libsonnet/1.29/_gen/meta/v1/watchEvent.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading