Skip to content

rebase-4.12.0-0.nightly-2023-01-03-161331 #1229

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
openshift-merge-robot merged 2 commits into from
Jan 4, 2023
Merged

rebase-4.12.0-0.nightly-2023-01-03-161331 #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26cb5fa
update last_rebase.sh
Jan 4, 2023
0e4048e
update manifests
Jan 4, 2023
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
5 changes: 5 additions & 0 deletions assets/controllers/kube-apiserver/defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@ apiServerArguments:
- /etc/kubernetes/static-pod-certs/secrets/service-network-serving-certkey/tls.crt
tls-private-key-file:
- /etc/kubernetes/static-pod-certs/secrets/service-network-serving-certkey/tls.key
# CVE-2022-3259: Set HTTP Strict Transport Security
# Chrome and Mozilla Firefox maintain an HSTS preload list
# See issue: golang.org/issue/26162
strict-transport-security-directives:
- max-age=31536000,includeSubDomains,preload
authConfig:
oauthMetadataFile: ""
consolePublicURL: ""
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-arm64-2023-01-02-175115"
"base": "4.12.0-0.nightly-arm64-2023-01-03-161334"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caa0fe9b53e4b0d2c9988fc20fa745ad80817a7cec36ba098d1812fab03e2add",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-2023-01-02-175114"
"base": "4.12.0-0.nightly-2023-01-03-161331"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9945c3f5475a37e145160d2fe6bb21948f1024a856827bc9e7d5bc882f44a750",
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-01-02-175114" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-01-02-175115"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-01-03-161331" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-01-03-161334"