Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-13-204333_amd64-2024-06-13_arm64-2024-06-13 #3486

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-bot merged 4 commits into from
Jun 14, 2024
+64 −17
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-13-204333_amd64-2024-06-13_arm64-2024-06-13 #3486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7131f51
update last_rebase.sh
Jun 14, 2024
ebeddbe
update changelog
Jun 14, 2024
592d042
update manifests
Jun 14, 2024
d95fcc6
update buildfiles
Jun 14, 2024
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
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-12-223752
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-13-204331
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-2024-06-11-200645
OCP_VERSION := 4.15.0-0.nightly-2024-06-13-204333
15 changes: 14 additions & 1 deletion assets/components/openshift-router/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,33 @@ spec:
- name: ROUTER_DOMAIN
value: apps.{{ .BaseDomain }}
livenessProbe:
failureThreshold: 3
httpGet:
path: /healthz
port: 1936
scheme: HTTP
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
terminationGracePeriodSeconds: 10
readinessProbe:
failureThreshold: 3
httpGet:
path: /healthz/ready
port: 1936
scheme: HTTP
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
startupProbe:
failureThreshold: 120
httpGet:
path: /healthz/ready
port: 1936
scheme: HTTP
periodSeconds: 1
successThreshold: 1
timeoutSeconds: 1
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -111,12 +124,12 @@ spec:
secretName: router-certs-default
- name: service-ca-bundle
configMap:
defaultMode: 420
items:
- key: service-ca.crt
path: service-ca.crt
name: service-ca-bundle
optional: false
defaultMode: 420
restartPolicy: Always
terminationGracePeriodSeconds: 3600
dnsPolicy: ClusterFirst
Expand Down
1 change: 1 addition & 0 deletions assets/components/openshift-router/service-internal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
port: 1936
protocol: TCP
targetPort: metrics
sessionAffinity: None
selector:
ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
metadata:
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:96489cff05e4c0f0679127b2949ad0033c47a908c790a043e4c27b2af2aff8f1
digest: sha256:329d9a71cc76e31893137f0102912b4f2b274f296307809ebb6f5d65a3f91a68
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:1bc56e5d074e61b9cfe25e326445e34237581a18b93171a78193ea386dabe1a7
digest: sha256:646c909c59826980cdac539b2e2d09c2d5321efea7e403bfad433c88634b6c37
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bc56e5d074e61b9cfe25e326445e34237581a18b93171a78193ea386dabe1a7
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:646c909c59826980cdac539b2e2d09c2d5321efea7e403bfad433c88634b6c37
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96489cff05e4c0f0679127b2949ad0033c47a908c790a043e4c27b2af2aff8f1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:329d9a71cc76e31893137f0102912b4f2b274f296307809ebb6f5d65a3f91a68
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-06-12-223752"
"base": "4.15.0-0.nightly-arm64-2024-06-13-204331"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:518b56b3ec1e32071ed70f544ba3003583bdc8327bc96f2ab3591f3eb662d1b3",
Expand Down
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-06-11-200645"
"base": "4.15.0-0.nightly-2024-06-13-204333"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96489cff05e4c0f0679127b2949ad0033c47a908c790a043e4c27b2af2aff8f1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bc56e5d074e61b9cfe25e326445e34237581a18b93171a78193ea386dabe1a7",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:329d9a71cc76e31893137f0102912b4f2b274f296307809ebb6f5d65a3f91a68",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:646c909c59826980cdac539b2e2d09c2d5321efea7e403bfad433c88634b6c37",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087"
}
}
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.15.0-0.nightly-arm64-2024-06-12-223752"
"base": "4.15.0-0.nightly-arm64-2024-06-13-204331"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4a6cfbf67a0a5b81c6a4d5eb9eec5cd7671faf813df9e04fb3c5b80e5c1ee8b",
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.15.0-0.nightly-2024-06-11-200645"
"base": "4.15.0-0.nightly-2024-06-13-204333"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4fd230c39c0836b2748516532577192ecdaa55e93943caf72bfa62fc26aaaa6",
Expand Down
33 changes: 33 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- cluster-ingress-operator embedded-component 37f7c42f4fea6f4668e5447f420d3a55b8e9f287 to a0ac804cae89b91763ec8d0e16ed918c49eb3411
- 6778ce1 2024-06-11T16:29:21-04:00 Add route upgradeable control loop for SHA-1 certs
- 3797141 2024-06-11T16:20:34-04:00 Add SignatureAlgorithm argument to generateCertificate
- 6c4576b 2024-06-11T16:20:34-04:00 Rename certificate generation E2E helper functions
- 09ceb00 2024-06-11T16:20:34-04:00 Bump openshift/api
- 26b6b7a 2024-06-11T16:19:14-04:00 Set Upgradeable=False if default cert uses SHA-1
- 553e182 2024-06-11T14:52:24-04:00 copyProbe: Refactor to group copying of defaults
- 8024aa1 2024-06-11T14:52:24-04:00 Specify parameter values for router probes
- 616eff5 2024-06-11T14:51:05-04:00 Modified-by: candita
- c111705 2024-06-11T14:30:30-04:00 Set "service-ca-bundle" volume's default mode
- 5a88ab0 2024-06-11T14:30:30-04:00 Test_deploymentConfigChanged: Use k8s.io/utils/ptr
- 21a7572 2024-06-11T14:30:30-04:00 TestHostNetworkPortBinding: Check service ports
- 65fda2b 2024-06-11T14:30:30-04:00 TestHostNetworkPortBinding: Use t.Log, t.Cleanup
- e9607ed 2024-06-11T14:30:30-04:00 Test_desiredInternalIngressControllerService: godoc
- 56f7cd7 2024-06-11T14:30:30-04:00 Test_desiredLoadBalancerService: Add assertions
- c2bc837 2024-06-11T14:30:30-04:00 Set SessionAffinity to avoid confusing diffs
- d2117eb 2024-06-11T14:30:30-04:00 crdChanged, nodePortServiceChanged: Fix preserves
- 6f41cf1 2024-06-11T14:30:30-04:00 Test_*Changed: Verify that some update was made
- c8a8b1d 2024-06-11T14:30:30-04:00 internalServiceChanged: Fix target port logic

- machine-config-operator embedded-component 4a4385ccb8c61013b04e5699d4a8d148e6e2a535 to eac63b92593461d31042085ab5d156bb680006ed
- e776b946 2024-04-11T00:44:55+00:00 OCPBUGS-29919: Decrease logs of haproxy

- operator-framework-olm embedded-component 50f148e2b1ed9eed9625d03f0d754bca53da1414 to d863e7cd095d747c6e9e43c6371470f78a064c65
- 726e49bc 2024-06-09T14:00:59+02:00 pin test catalog
- 2f247250 2024-06-09T14:00:59+02:00 bump to go1.20
- eb1a88ea 2024-06-09T14:00:59+02:00 patch subscription e2e flake (#3302)
- 25d18450 2024-06-09T14:00:56+02:00 patch installplan e2e (#3301)
- 996682cb 2024-06-09T13:57:39+02:00 re-enable seed and skip options for e2e (#3296)
- edb54359 2024-06-09T13:57:39+02:00 :seedling: parameterizes the e2e target and pins opm images (#3275)
- dbb7d144 2024-06-09T13:57:39+02:00 :seedling: patch flakes (#3281)
- 7fa69878 2024-06-09T13:57:39+02:00 bugfix: refactor test package names 'packageA' and 'packageB' because they break naming conventions (#3260)

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 87d7080a91e9247c9fde6c3e2d9e222c23df541e
https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690
https://github.com/openshift/cluster-ingress-operator embedded-component 37f7c42f4fea6f4668e5447f420d3a55b8e9f287
https://github.com/openshift/cluster-ingress-operator embedded-component a0ac804cae89b91763ec8d0e16ed918c49eb3411
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component eae692607f7ef1cfc6ef95bcd57c67f04d2c165c
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796
Expand All @@ -11,9 +11,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c
https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd
https://github.com/openshift/kubernetes embedded-component a2c84a5418d02fbb0230fa10ade3e3c3d093f891
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
https://github.com/openshift/machine-config-operator embedded-component 4a4385ccb8c61013b04e5699d4a8d148e6e2a535
https://github.com/openshift/machine-config-operator embedded-component eac63b92593461d31042085ab5d156bb680006ed
https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813
https://github.com/openshift/operator-framework-olm embedded-component 50f148e2b1ed9eed9625d03f0d754bca53da1414
https://github.com/openshift/operator-framework-olm embedded-component d863e7cd095d747c6e9e43c6371470f78a064c65
https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4
https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6
https://github.com/openshift/oc image-amd64 44edfb50c55756395abc844fc4f7edb19dfefa50
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.15.0-0.nightly-2024-06-11-200645" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-12-223752"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-06-13-204333" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-13-204331"