Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.kube_git.var
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=30
KUBE_GIT_VERSION=v1.30.2
KUBE_GIT_COMMIT=1bead22a2ef091d421bbe4e455799fac869c3c80
KUBE_GIT_COMMIT=32f817d75efea03f9baf659eaf373569c4d85f56
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-24-205626
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-25-224526
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-2024-07-20-191204
OCP_VERSION := 4.17.0-0.nightly-2024-07-25-142842
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:993cc8b6336d06dcabdfa4b22f295f9b3211e054c7020f8d2cf411a54fc795ab
digest: sha256:d3f832755ab753b8fd30690ecbad1ee95abf10f6bfff4db450f853979ac46a53
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4e6a1dec5d943cf101cb23431be54f4ef54413d4ce263292e089a484def37772
digest: sha256:a6a33b44d690afd30fabedfe53cecdf797da88d61bc7001780cfc116d7abf494
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-24-205626"
"base": "4.17.0-0.nightly-arm64-2024-07-25-224526"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fba91b43df563fcdbe7e448e39310e293add75bc414718e5f1f9b0363037fd94",
Expand Down
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-07-20-191204"
"base": "4.17.0-0.nightly-2024-07-25-142842"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:993cc8b6336d06dcabdfa4b22f295f9b3211e054c7020f8d2cf411a54fc795ab",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e6a1dec5d943cf101cb23431be54f4ef54413d4ce263292e089a484def37772"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3f832755ab753b8fd30690ecbad1ee95abf10f6bfff4db450f853979ac46a53",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6a33b44d690afd30fabedfe53cecdf797da88d61bc7001780cfc116d7abf494"
}
}
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:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236
digest: sha256:8faff1339936ba2c98a60b3f3075d0381a6b34f896c13824aa3b095bd62b3ef1
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fcefa234e850036b03d063238e57eb15eada240b785c21656ea642ad82af09eb
digest: sha256:4bbba2f8b6c995d837436a8057bef8f0f687060fbd2a017038e7272d8d950190
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925
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:fcefa234e850036b03d063238e57eb15eada240b785c21656ea642ad82af09eb
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bbba2f8b6c995d837436a8057bef8f0f687060fbd2a017038e7272d8d950190
- 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:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8faff1339936ba2c98a60b3f3075d0381a6b34f896c13824aa3b095bd62b3ef1
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705
digest: sha256:78c15c47b52dc8af86948affdf28948d51132e77b1a3dce3ed641e0d17a0ad8e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ae0b49f0f349fc6729539d68763e3b1432f0ae2f4083db4dc8b7fb0b62ba1802
digest: sha256:b53f40f0d760a7ed27e781774d9c06a96a898b80d2e27874f02404272ffc2a73
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602
digest: sha256:a659da0bca75454749891ba4c9951878e4b5aeab9d385d7933de4ce25f10111b

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae0b49f0f349fc6729539d68763e3b1432f0ae2f4083db4dc8b7fb0b62ba1802
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b53f40f0d760a7ed27e781774d9c06a96a898b80d2e27874f02404272ffc2a73
- 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:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78c15c47b52dc8af86948affdf28948d51132e77b1a3dce3ed641e0d17a0ad8e
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-24-205626"
"base": "4.17.0-0.nightly-arm64-2024-07-25-224526"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcefa234e850036b03d063238e57eb15eada240b785c21656ea642ad82af09eb",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8faff1339936ba2c98a60b3f3075d0381a6b34f896c13824aa3b095bd62b3ef1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bbba2f8b6c995d837436a8057bef8f0f687060fbd2a017038e7272d8d950190",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-07-20-191204"
"base": "4.17.0-0.nightly-2024-07-25-142842"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e1a347e2cf27adbe679981edafbd1062ca1e8566479de6dc528648a7fb6705",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae0b49f0f349fc6729539d68763e3b1432f0ae2f4083db4dc8b7fb0b62ba1802",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78c15c47b52dc8af86948affdf28948d51132e77b1a3dce3ed641e0d17a0ad8e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b53f40f0d760a7ed27e781774d9c06a96a898b80d2e27874f02404272ffc2a73",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a659da0bca75454749891ba4c9951878e4b5aeab9d385d7933de4ce25f10111b"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-24-205626"
"base": "4.17.0-0.nightly-arm64-2024-07-25-224526"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93426baff45fd6a846a9d105784650b5934d1ecf85d645c829300df86370f5c",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be76b52b4abfce55d034a71232960277936c6b69f55d91da7525935e67fc4ef1",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed63cf399a60fce79d0cb1cffd0e745e02d932a84f619a0fb9a48d4bfa72d669",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9edfbdbfadc0a286347f0020acbe6ebf4c98c188b413a45b53b54d5484f1105",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925",
Expand Down
20 changes: 10 additions & 10 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-07-20-191204"
"base": "4.17.0-0.nightly-2024-07-25-142842"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc035506ee078ba72b81f7954b90a46aa7ef665e44d4bfb1eea49fe05b484a7c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c878365260769346c72dc45d873810da37f881112e3ca76ac891cae0f240f569",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:881652d6daf58b9a7a9d186ec4f9d6c984921e3a86d46ecafa6da92b7f584bd4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc2e02535158da03168faa2808c5a12c0cd1593533382d1b29f4c5d6fcfc3602",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4dafa6aef4f6fa46bc644a6e35fe7601b4af7131233cad797d867d4443a86d04",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:645f77e1add7e4dc730638269797da38984b339c7510f5d0bdc03af0f1aad95a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3663c528b705c096ab857e25c83d172e9d219a5f168d1850ba68d93685b43137",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a659da0bca75454749891ba4c9951878e4b5aeab9d385d7933de4ce25f10111b",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9066c4b3ee94829822dc2590c6a41b0157095023f687b3ef62688c1e2ad9e83",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5764c3f342c002ae1359e7e4a05c05c727cd021a7f8385e9915150d90e5e7165",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3a607ca09b916b1884473a8f78275871b7b2a53b7971fbf7651cbf08c51729c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e4a26e79bbaddf6ae5d44977b682d6dbecc77dd536e8ef104bf78d4d9d364e0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd4ea234ca1cd75f0d8987b7555dceb68bd5a15cea498bb6aae1e3541d6fe0e8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68d0e5b470d096e3936c872195987a8e50e746115c7f3ad50747d580026e2d81",
"lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:1901bc1f4affaf9db870dd6eaea6eb5d0a33eb60aaca2ed12253b48ceafa2d90",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d8c6adeb3ee11749f580e9813761584f6cb0c305df2a41bddfcceeb7ff272ee",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:497f8207877412c25ceb33c3e299e0fbbd27c367da244254fa6999a1a5ec4998"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e77ee1266dc31c920cf5ba7ff4ad064f31f8d1cfe1d51906df4e4e80afb903dc",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f4d8bbf993d96e409c556c8829562b67722f75acc2a7bba92d4e54374e19166"
}
}
Loading