diff --git a/assets/optional/cert-manager/crd/bases/certificaterequests.cert-manager.io-crd.yaml b/assets/optional/cert-manager/crd/bases/certificaterequests.cert-manager.io-crd.yaml index f516121c12..d7775d20a2 100644 --- a/assets/optional/cert-manager/crd/bases/certificaterequests.cert-manager.io-crd.yaml +++ b/assets/optional/cert-manager/crd/bases/certificaterequests.cert-manager.io-crd.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.19.4 + app.kubernetes.io/version: v1.19.5 name: certificaterequests.cert-manager.io spec: group: cert-manager.io diff --git a/assets/optional/cert-manager/crd/bases/certificates.cert-manager.io-crd.yaml b/assets/optional/cert-manager/crd/bases/certificates.cert-manager.io-crd.yaml index 4e063e0b86..80dea8429a 100644 --- a/assets/optional/cert-manager/crd/bases/certificates.cert-manager.io-crd.yaml +++ b/assets/optional/cert-manager/crd/bases/certificates.cert-manager.io-crd.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.19.4 + app.kubernetes.io/version: v1.19.5 name: certificates.cert-manager.io spec: group: cert-manager.io diff --git a/assets/optional/cert-manager/crd/bases/challenges.acme.cert-manager.io-crd.yaml b/assets/optional/cert-manager/crd/bases/challenges.acme.cert-manager.io-crd.yaml index 2e33aab7f7..f2fe03d3e1 100644 --- a/assets/optional/cert-manager/crd/bases/challenges.acme.cert-manager.io-crd.yaml +++ b/assets/optional/cert-manager/crd/bases/challenges.acme.cert-manager.io-crd.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.19.4 + app.kubernetes.io/version: v1.19.5 name: challenges.acme.cert-manager.io spec: group: acme.cert-manager.io @@ -408,7 +408,7 @@ spec: description: |- The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be - enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. + enclosed in square brackets (e.g [2001:db8::1]); port is optional. This field is required. type: string protocol: diff --git a/assets/optional/cert-manager/crd/bases/clusterissuers.cert-manager.io-crd.yaml b/assets/optional/cert-manager/crd/bases/clusterissuers.cert-manager.io-crd.yaml index 42e8410a9e..ef987caff9 100644 --- a/assets/optional/cert-manager/crd/bases/clusterissuers.cert-manager.io-crd.yaml +++ b/assets/optional/cert-manager/crd/bases/clusterissuers.cert-manager.io-crd.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.19.4 + app.kubernetes.io/version: v1.19.5 name: clusterissuers.cert-manager.io spec: group: cert-manager.io @@ -521,7 +521,7 @@ spec: description: |- The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be - enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. + enclosed in square brackets (e.g [2001:db8::1]); port is optional. This field is required. type: string protocol: diff --git a/assets/optional/cert-manager/crd/bases/issuers.cert-manager.io-crd.yaml b/assets/optional/cert-manager/crd/bases/issuers.cert-manager.io-crd.yaml index 44ddc33b35..79d98b84b4 100644 --- a/assets/optional/cert-manager/crd/bases/issuers.cert-manager.io-crd.yaml +++ b/assets/optional/cert-manager/crd/bases/issuers.cert-manager.io-crd.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.19.4 + app.kubernetes.io/version: v1.19.5 name: issuers.cert-manager.io spec: group: cert-manager.io @@ -520,7 +520,7 @@ spec: description: |- The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be - enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. + enclosed in square brackets (e.g [2001:db8::1]); port is optional. This field is required. type: string protocol: diff --git a/assets/optional/cert-manager/crd/bases/orders.acme.cert-manager.io-crd.yaml b/assets/optional/cert-manager/crd/bases/orders.acme.cert-manager.io-crd.yaml index 94eddfa124..2aa9579b10 100644 --- a/assets/optional/cert-manager/crd/bases/orders.acme.cert-manager.io-crd.yaml +++ b/assets/optional/cert-manager/crd/bases/orders.acme.cert-manager.io-crd.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.19.4 + app.kubernetes.io/version: v1.19.5 name: orders.acme.cert-manager.io spec: group: acme.cert-manager.io diff --git a/assets/optional/cert-manager/manager/manager.yaml b/assets/optional/cert-manager/manager/manager.yaml index a19ad2cf8b..59dfe5bb21 100644 --- a/assets/optional/cert-manager/manager/manager.yaml +++ b/assets/optional/cert-manager/manager/manager.yaml @@ -75,25 +75,25 @@ spec: - name: OPERATOR_NAME value: cert-manager-operator - name: RELATED_IMAGE_CERT_MANAGER_WEBHOOK - value: quay.io/jetstack/cert-manager-webhook:v1.19.4 + value: quay.io/jetstack/cert-manager-webhook:v1.19.5 - name: RELATED_IMAGE_CERT_MANAGER_CA_INJECTOR - value: quay.io/jetstack/cert-manager-cainjector:v1.19.4 + value: quay.io/jetstack/cert-manager-cainjector:v1.19.5 - name: RELATED_IMAGE_CERT_MANAGER_CONTROLLER - value: quay.io/jetstack/cert-manager-controller:v1.19.4 + value: quay.io/jetstack/cert-manager-controller:v1.19.5 - name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER - value: quay.io/jetstack/cert-manager-acmesolver:v1.19.4 + value: quay.io/jetstack/cert-manager-acmesolver:v1.19.5 - name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR value: quay.io/jetstack/cert-manager-istio-csr:v0.16.0 - name: RELATED_IMAGE_CERT_MANAGER_TRUST_MANAGER value: quay.io/jetstack/trust-manager:v0.20.3 - name: OPERAND_IMAGE_VERSION - value: 1.19.4 + value: 1.19.5 - name: ISTIOCSR_OPERAND_IMAGE_VERSION value: 0.16.0 - name: TRUSTMANAGER_OPERAND_IMAGE_VERSION value: 0.20.3 - name: OPERATOR_IMAGE_VERSION - value: 1.19.0 + value: 1.19.1 - name: OPERATOR_LOG_LEVEL value: '2' - name: TRUSTED_CA_CONFIGMAP_NAME diff --git a/assets/optional/sriov/kustomization.aarch64.yaml b/assets/optional/sriov/kustomization.aarch64.yaml index d1574ea6ea..6dd7a4ae3a 100644 --- a/assets/optional/sriov/kustomization.aarch64.yaml +++ b/assets/optional/sriov/kustomization.aarch64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:d7ee254fc9d47bd5179f76e4122983304ec75b5ea43f4defe2d0f96f04eb8690 + digest: sha256:5b33fe72cbe5486de2dca91f912b39cd757fafad1d3a984916a5ec776897cda2 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:71edd9e131252d72242756270e02b75859134de7ccbb49bd109f9b3e349c2367 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a704b198ba93a09cce192cbe8fc75f6cc244e8dd5eef91ccbc30480046f39391 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6be7361f4c3a345589994dc785b2cd5da3c8123c6ad56211e4af5de232800f76 + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:bac558d1114459fba8e902e8cb5dc42dac09e1d22579132f22bb69dced8d97e2 - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:162cbf43222d4c7943574f84f59e29f69b6996e1693db85ddee19832441a0718 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:5bc744e22de2110b04d0acb18dda686698dda1eb34b866198d71f26f11a6c206 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6d7ed1bc1504105bbad73bc98c78a19074e81b9ea5fc1a090612086893f5130a + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:d212a6afdd7301459bca05ad8f485cef8d92e24636c89a6c76efff73554d92e9 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5142fd6ea06766233e916ee0564fdb02e75582c8154814da05f66e9695665f35 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5e365ccbdb73529fc78d30e15ac2f8a324c7ee0be6a8b19cb51f183dc5e2e867 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:003aaeab02e56e3ea2d46cd0ac875f001f18939915fdd1bb6767a8e67e552877 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:1862d64b746ce762d64256a3158dc56cb391cb700d6c53a453e42aec24a0b847 - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e43211c222e1734a5443826afc1f1104b61457ef7b67647e5f608136a355d5d6 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e0585578cdf9309bd08028d7d0fbf05c45ddcf0d768328f88ad2eedb6a5f31d8 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:7b7b706bc0c431f1961336b0b205c59ae8b87d89e05d54d038f67e7acfbc241c + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:3869072b9179c673bcae7f7929abb525fbd6a8f0aaf601ce992a0a994e8fd2c4 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:22469fe4645b112b9db600a2eb90b93d55ea18ce2da2a8637c50ac781618c495 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed3194db7c7e8cafdcc73a706a3526fba1c419f8961d5bc69abc536e9e89a035 target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/kustomization.x86_64.yaml b/assets/optional/sriov/kustomization.x86_64.yaml index 89063ce487..1e9ef893c8 100644 --- a/assets/optional/sriov/kustomization.x86_64.yaml +++ b/assets/optional/sriov/kustomization.x86_64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:568d7734e5bd64f9bd74b836810c1b89f2f481a4eb403d93b218604fa8a5ee62 + digest: sha256:bdaf084ae63e7179c0a60e5e809fba881cac0fc8c21de516eacfea199b54be60 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:309f2975276b6407402bd1ac0ef7a07e809845a33259283c28925ee2321271e8 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:539e34a367837a297ceef7fc657615280d97d02a10f503a5636cd844e91113df - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:479a1835efcb315af7681a0c6e9cb959570e850a4cb5844a797390e27cd619c6 + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:e0cd00e5c691226c1bdcd0c56caf8393fb1668f27aca92891f9572e90817102d - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:671dd3ee25bb4a24ec5741cbb6b5d168d7af4e4e7e90a332913552ff6576efa0 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:59fef90610984eeac0b9b1d4fb74e7551e97091bd8082fd05cc9e00e30d8de47 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:837d9b0b190a87e6037babecde6c7667f9e69fd044620da0fc795881b6a42ad7 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:deda65fbe9ce9978c0543f26add8e9b648b3ac37db440a92b93891357596d08d - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cc70de95764cdd38fd41500e34e40640782095a84a12a797981946a95dbfdd83 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:232f9e8658170ff3d88bdb460265c56e4fef0a978429dee7ba18b969c7934e0f - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:77c3b55e366168b1eb1dbdf9482595d547b8cc0a69a1655a34c873c0d3487cab + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ff5f87b8464c172ae1bb5cf15c370b7250bda12696491cf77197af37352122f5 - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:7fccda1ff324927248587007f684dea1db2bfdd6d1943dd9c2d24a4a0ccda33e + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:195f1d0d7040fb2b6b60ae9356593788c5e15ccbb8bd0e036835100b4d5fc641 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:8ad8a53e0df7112d0f4f0abc373bf24bbec42e3033f5b27dfe9e6be674cef94d + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:64a524df1a3cc4d449d0962704fce2bfc65023cd2fbb954e52a2aaba2677ef2e - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:0299bce77fb9f786465c23efc36aca6557ddea63b9642c2176b17f827addddb2 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6c1c4d4bcbfa2b29b8588b68b7ce022ea65f12bec037d32dd461736b67c45d7b target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json index 8f84c5e58b..f1554115f4 100644 --- a/assets/optional/sriov/release-sriov-aarch64.json +++ b/assets/optional/sriov/release-sriov-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.21.0-202605261300" + "base": "4.21.0-202606240914" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:7b7b706bc0c431f1961336b0b205c59ae8b87d89e05d54d038f67e7acfbc241c", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:22469fe4645b112b9db600a2eb90b93d55ea18ce2da2a8637c50ac781618c495", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:162cbf43222d4c7943574f84f59e29f69b6996e1693db85ddee19832441a0718", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e43211c222e1734a5443826afc1f1104b61457ef7b67647e5f608136a355d5d6", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:71edd9e131252d72242756270e02b75859134de7ccbb49bd109f9b3e349c2367", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6be7361f4c3a345589994dc785b2cd5da3c8123c6ad56211e4af5de232800f76", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:003aaeab02e56e3ea2d46cd0ac875f001f18939915fdd1bb6767a8e67e552877", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6d7ed1bc1504105bbad73bc98c78a19074e81b9ea5fc1a090612086893f5130a", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:d7ee254fc9d47bd5179f76e4122983304ec75b5ea43f4defe2d0f96f04eb8690", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5142fd6ea06766233e916ee0564fdb02e75582c8154814da05f66e9695665f35" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:3869072b9179c673bcae7f7929abb525fbd6a8f0aaf601ce992a0a994e8fd2c4", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed3194db7c7e8cafdcc73a706a3526fba1c419f8961d5bc69abc536e9e89a035", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:5bc744e22de2110b04d0acb18dda686698dda1eb34b866198d71f26f11a6c206", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e0585578cdf9309bd08028d7d0fbf05c45ddcf0d768328f88ad2eedb6a5f31d8", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a704b198ba93a09cce192cbe8fc75f6cc244e8dd5eef91ccbc30480046f39391", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:bac558d1114459fba8e902e8cb5dc42dac09e1d22579132f22bb69dced8d97e2", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:1862d64b746ce762d64256a3158dc56cb391cb700d6c53a453e42aec24a0b847", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:d212a6afdd7301459bca05ad8f485cef8d92e24636c89a6c76efff73554d92e9", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:5b33fe72cbe5486de2dca91f912b39cd757fafad1d3a984916a5ec776897cda2", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5e365ccbdb73529fc78d30e15ac2f8a324c7ee0be6a8b19cb51f183dc5e2e867" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index 74ca5c5588..cad1a10447 100644 --- a/assets/optional/sriov/release-sriov-x86_64.json +++ b/assets/optional/sriov/release-sriov-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.21.0-202605261300" + "base": "4.21.0-202606240914" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:8ad8a53e0df7112d0f4f0abc373bf24bbec42e3033f5b27dfe9e6be674cef94d", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:0299bce77fb9f786465c23efc36aca6557ddea63b9642c2176b17f827addddb2", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:671dd3ee25bb4a24ec5741cbb6b5d168d7af4e4e7e90a332913552ff6576efa0", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:7fccda1ff324927248587007f684dea1db2bfdd6d1943dd9c2d24a4a0ccda33e", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:309f2975276b6407402bd1ac0ef7a07e809845a33259283c28925ee2321271e8", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:479a1835efcb315af7681a0c6e9cb959570e850a4cb5844a797390e27cd619c6", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:77c3b55e366168b1eb1dbdf9482595d547b8cc0a69a1655a34c873c0d3487cab", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:837d9b0b190a87e6037babecde6c7667f9e69fd044620da0fc795881b6a42ad7", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:568d7734e5bd64f9bd74b836810c1b89f2f481a4eb403d93b218604fa8a5ee62", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cc70de95764cdd38fd41500e34e40640782095a84a12a797981946a95dbfdd83" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:64a524df1a3cc4d449d0962704fce2bfc65023cd2fbb954e52a2aaba2677ef2e", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6c1c4d4bcbfa2b29b8588b68b7ce022ea65f12bec037d32dd461736b67c45d7b", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:59fef90610984eeac0b9b1d4fb74e7551e97091bd8082fd05cc9e00e30d8de47", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:195f1d0d7040fb2b6b60ae9356593788c5e15ccbb8bd0e036835100b4d5fc641", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:539e34a367837a297ceef7fc657615280d97d02a10f503a5636cd844e91113df", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:e0cd00e5c691226c1bdcd0c56caf8393fb1668f27aca92891f9572e90817102d", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ff5f87b8464c172ae1bb5cf15c370b7250bda12696491cf77197af37352122f5", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:deda65fbe9ce9978c0543f26add8e9b648b3ac37db440a92b93891357596d08d", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:bdaf084ae63e7179c0a60e5e809fba881cac0fc8c21de516eacfea199b54be60", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:232f9e8658170ff3d88bdb460265c56e4fef0a978429dee7ba18b969c7934e0f" } } diff --git a/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/controllermanager.go index 67559daae6..182e41b852 100644 --- a/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/controllermanager.go +++ b/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/controllermanager.go @@ -38,6 +38,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/flagz" "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" @@ -156,7 +157,8 @@ controller, and serviceaccounts controller.`, fg.(featuregate.MutableFeatureGate).AddMetrics() // add component version metrics s.ComponentGlobalsRegistry.AddMetrics() - return Run(cmd.Context(), c.Complete(), cmd.Context().Done()) + stopCh := server.SetupSignalHandler() + return Run(context.Background(), c.Complete(), stopCh) }, Args: func(cmd *cobra.Command, args []string) error { for _, arg := range args { diff --git a/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/options/options.go b/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/options/options.go index 2deac47609..2a1e8000b1 100644 --- a/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/options/options.go +++ b/deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/options/options.go @@ -47,7 +47,6 @@ import ( logsapi "k8s.io/component-base/logs/api/v1" "k8s.io/component-base/metrics" cmoptions "k8s.io/controller-manager/options" - "k8s.io/klog/v2" kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" "k8s.io/kubernetes/cmd/kube-controller-manager/names" @@ -319,7 +318,7 @@ func (s *KubeControllerManagerOptions) Flags(allControllers []string, disabledBy if !utilfeature.DefaultFeatureGate.Enabled(featuregate.Feature(clientgofeaturegate.WatchListClient)) { ver := version.MustParse("1.34") if err := utilfeature.DefaultMutableFeatureGate.OverrideDefaultAtVersion(featuregate.Feature(clientgofeaturegate.WatchListClient), true, ver); err != nil { - klog.Warning(fmt.Sprintf("unable to set %s feature gate, err: %v", clientgofeaturegate.WatchListClient, err)) + panic(fmt.Sprintf("unable to set %s feature gate, err: %v", clientgofeaturegate.WatchListClient, err)) } } diff --git a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go index 113f3dab1c..e20ae39ef9 100644 --- a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go +++ b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go @@ -70,16 +70,17 @@ func main() { Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]')) && labels.exists(l, l == "Conformance")`)}, }) - // AddGlobalSuite so the umbrella starts with zero qualifiers and inherits - // exclusively from its children via mergeParentQualifiers in origin. - kubeTestsExtension.AddGlobalSuite(e.Suite{ - Name: "kubernetes/conformance", + // kubernetes/conformance is used by OCPT to run the minimal true upstream + // Kubernetes conformance tests, not the broader view OCP takes of what + // "conformance" means. + kubeTestsExtension.AddSuite(e.Suite{ + Name: "kubernetes/conformance", + Qualifiers: []string{withExcludedTestsFilter(`labels.exists(l, l == "Conformance")`)}, }) kubeTestsExtension.AddSuite(e.Suite{ Name: "kubernetes/conformance/parallel", Parents: []string{ - "kubernetes/conformance", "openshift/conformance/parallel", }, Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[Serial]'))`)}, @@ -88,7 +89,6 @@ func main() { kubeTestsExtension.AddSuite(e.Suite{ Name: "kubernetes/conformance/serial", Parents: []string{ - "kubernetes/conformance", "openshift/conformance/serial", }, Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]'))`)}, diff --git a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go index e92ab9e9ff..0e3a44d3ab 100644 --- a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go +++ b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go @@ -21,8 +21,10 @@ import ( ingressadmission "k8s.io/kubernetes/openshift-kube-apiserver/admission/route" "k8s.io/kubernetes/openshift-kube-apiserver/admission/route/hostassignment" projectnodeenv "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster" schedulerpodnodeconstraints "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/podnodeconstraints" "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/performantsecuritypolicy" ) func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { @@ -42,6 +44,10 @@ func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { externalipranger.RegisterExternalIP(plugins) restrictedendpoints.RegisterRestrictedEndpoints(plugins) csiinlinevolumesecurity.Register(plugins) + performantsecuritypolicy.Register(plugins) + if nodeselectoradjuster.IsStandalone() { + nodeselectoradjuster.Register(plugins) + } } var ( @@ -58,23 +64,31 @@ var ( ) // openshiftAdmissionPluginsForKubeBeforeMutating are the admission plugins to add after kube admission, before mutating webhooks - openshiftAdmissionPluginsForKubeBeforeMutating = []string{ - "autoscaling.openshift.io/ClusterResourceOverride", - managementcpusoverride.PluginName, // "autoscaling.openshift.io/ManagementCPUsOverride" - "authorization.openshift.io/RestrictSubjectBindings", - "autoscaling.openshift.io/RunOnceDuration", - "scheduling.openshift.io/PodNodeConstraints", - "scheduling.openshift.io/OriginPodNodeEnvironment", - "network.openshift.io/ExternalIPRanger", - "network.openshift.io/RestrictedEndpointsAdmission", - imagepolicyapiv1.PluginName, // "image.openshift.io/ImagePolicy" - "security.openshift.io/SecurityContextConstraint", - "security.openshift.io/SCCExecRestrictions", - "route.openshift.io/IngressAdmission", - hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" - csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" - mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs" - } + openshiftAdmissionPluginsForKubeBeforeMutating = func() []string { + plugins := []string{ + "autoscaling.openshift.io/ClusterResourceOverride", + managementcpusoverride.PluginName, // "autoscaling.openshift.io/ManagementCPUsOverride" + "authorization.openshift.io/RestrictSubjectBindings", + "autoscaling.openshift.io/RunOnceDuration", + "scheduling.openshift.io/PodNodeConstraints", + "scheduling.openshift.io/OriginPodNodeEnvironment", + "network.openshift.io/ExternalIPRanger", + "network.openshift.io/RestrictedEndpointsAdmission", + imagepolicyapiv1.PluginName, // "image.openshift.io/ImagePolicy" + "security.openshift.io/SecurityContextConstraint", + "security.openshift.io/SCCExecRestrictions", + "route.openshift.io/IngressAdmission", + hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" + csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" + managednode.PluginName, // "autoscaling.openshift.io/ManagedNode" + mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs" + performantsecuritypolicy.PluginName, // "storage.openshift.io/PerformantSecurityPolicy" + } + if nodeselectoradjuster.IsStandalone() { + plugins = append(plugins, nodeselectoradjuster.PluginName) // "scheduling.openshift.io/NodeSelectorAdjuster" + } + return plugins + }() // openshiftAdmissionPluginsForKubeAfterResourceQuota are the plugins to add after ResourceQuota plugin openshiftAdmissionPluginsForKubeAfterResourceQuota = []string{ diff --git a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go.rej b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go.rej new file mode 100644 index 0000000000..cae0c5f74b --- /dev/null +++ b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go.rej @@ -0,0 +1,32 @@ +diff a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go (rejected hunks) +@@ -24,7 +23,6 @@ import ( + projectnodeenv "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" + schedulerpodnodeconstraints "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/podnodeconstraints" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity" +- "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/performantsecuritypolicy" + ) + + func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { +@@ -45,7 +42,6 @@ func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { + externalipranger.RegisterExternalIP(plugins) + restrictedendpoints.RegisterRestrictedEndpoints(plugins) + csiinlinevolumesecurity.Register(plugins) +- performantsecuritypolicy.Register(plugins) + } + + var ( +@@ -75,11 +71,9 @@ var ( + "security.openshift.io/SecurityContextConstraint", + "security.openshift.io/SCCExecRestrictions", + "route.openshift.io/IngressAdmission", +- hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" +- csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" +- managednode.PluginName, // "autoscaling.openshift.io/ManagedNode" +- mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs" +- performantsecuritypolicy.PluginName, // "storage.openshift.io/PerformantSecurityPolicy" ++ hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" ++ csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" ++ mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs" + } + + // openshiftAdmissionPluginsForKubeAfterResourceQuota are the plugins to add after ResourceQuota plugin diff --git a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster/admission.go b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster/admission.go new file mode 100644 index 0000000000..9fa7770e9f --- /dev/null +++ b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster/admission.go @@ -0,0 +1,112 @@ +package nodeselectoradjuster + +// The NodeSelectorAdjuster admission plugin adds the +// node-role.kubernetes.io/control-plane node selector to qualifying pods. It only +// activates on standalone OpenShift clusters, detected by +// POD_NAMESPACE=openshift-kube-apiserver. On hosted control plane (HCP) +// clusters the plugin does not register itself and takes no action, allowing +// qualifying pods to be scheduled on data plane worker nodes without +// modification. + +import ( + "context" + "fmt" + "io" + "os" + + corev1 "k8s.io/api/core/v1" + "k8s.io/apiserver/pkg/admission" + coreapi "k8s.io/kubernetes/pkg/apis/core" +) + +const ( + // PluginName is the name used to identify this plugin in the admission chain. + PluginName = "scheduling.openshift.io/NodeSelectorAdjuster" + + // controlPlaneRoleKey is the node role label used as a node selector key + controlPlaneRoleKey = "node-role.kubernetes.io/control-plane" + + // vpaOperatorLabelKey / vpaOperatorLabelValue identify the VPA operator pod. + vpaOperatorLabelKey = "k8s-app" + vpaOperatorLabelValue = "vertical-pod-autoscaler-operator" + // vpaOperatorNamespace is the namespace the VPA operator is expected to run in. + vpaOperatorNamespace = "openshift-vertical-pod-autoscaler" + + // standaloneEnvVar is the environment variable checked at start-up. + // It is injected by the downward API and reflects the namespace the + // kube-apiserver pod runs in. + standaloneEnvVar = "POD_NAMESPACE" + // standaloneEnvValue is the namespace used by the kube-apiserver on a + // standalone OpenShift cluster. + standaloneEnvValue = "openshift-kube-apiserver" +) + +// IsStandalone reports whether the current process is running inside a standalone +// OpenShift cluster. It is checked once at start-up to decide whether the plugin +// should register itself. +func IsStandalone() bool { + return os.Getenv(standaloneEnvVar) == standaloneEnvValue +} + +// Register adds the plugin to the admission plugin registry. It must only be +// called when IsStandalone() returns true. +func Register(plugins *admission.Plugins) { + plugins.Register(PluginName, func(_ io.Reader) (admission.Interface, error) { + return &nodeSelectorAdjuster{ + Handler: admission.NewHandler(admission.Create), + }, nil + }) +} + +// nodeSelectorAdjuster implements admission.MutationInterface. +type nodeSelectorAdjuster struct { + *admission.Handler +} + +var _ admission.MutationInterface = &nodeSelectorAdjuster{} + +// Admit examines newly-created Pod objects and, for qualifying pods, adds the control-plane +// node selector so that they run on control-plane nodes on standalone clusters. +func (p *nodeSelectorAdjuster) Admit(_ context.Context, attr admission.Attributes, _ admission.ObjectInterfaces) error { + if attr.GetResource().GroupResource() != corev1.Resource("pods") || attr.GetSubresource() != "" { + return nil + } + + pod, ok := attr.GetObject().(*coreapi.Pod) + if !ok { + return admission.NewForbidden(attr, fmt.Errorf("unexpected object type: %T", attr.GetObject())) + } + + if !requiresNodeSelectorAdjustment(pod) { + return nil + } + + addControlPlaneNodeSelector(pod) + return nil +} + +// ValidateInitialization satisfies admission.InitializationValidator. The plugin +// has no external dependencies to validate. +func (p *nodeSelectorAdjuster) ValidateInitialization() error { + return nil +} + +// requiresNodeSelectorAdjustment returns true when the pod carries a label that +// opts it in to control-plane node placement and lives in a namespace where that +// label is expected. Currently the VPA operator pod opts in via its well-known +// label. Future control-plane-adjacent Day 2 operators can be added here. +func requiresNodeSelectorAdjustment(pod *coreapi.Pod) bool { + if pod.Labels[vpaOperatorLabelKey] == vpaOperatorLabelValue && + pod.Namespace == vpaOperatorNamespace { + return true + } + return false +} + +// addControlPlaneNodeSelector ensures spec.nodeSelector contains the control-plane role key. +func addControlPlaneNodeSelector(pod *coreapi.Pod) { + if pod.Spec.NodeSelector == nil { + pod.Spec.NodeSelector = map[string]string{} + } + pod.Spec.NodeSelector[controlPlaneRoleKey] = "" +} diff --git a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster/admission_test.go b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster/admission_test.go new file mode 100644 index 0000000000..630616f343 --- /dev/null +++ b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeselectoradjuster/admission_test.go @@ -0,0 +1,255 @@ +package nodeselectoradjuster + +import ( + "context" + "testing" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/authentication/user" + coreapi "k8s.io/kubernetes/pkg/apis/core" +) + +func TestAdmit(t *testing.T) { + tests := []struct { + name string + pod *coreapi.Pod + resource schema.GroupVersionResource + subresource string + expectedNodeSelector map[string]string + }{ + { + name: "VPA operator pod: control-plane node selector is added", + pod: makePod( + withNamespace(vpaOperatorNamespace), + withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: map[string]string{controlPlaneRoleKey: ""}, + }, + { + name: "VPA operator pod: control-plane node selector added alongside existing selectors", + pod: makePod( + withNamespace(vpaOperatorNamespace), + withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue}), + withNodeSelector(map[string]string{"topology.kubernetes.io/zone": "us-east-1a"}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: map[string]string{ + controlPlaneRoleKey: "", + "topology.kubernetes.io/zone": "us-east-1a", + }, + }, + { + name: "VPA operator pod: control-plane node selector already present is left unchanged", + pod: makePod( + withNamespace(vpaOperatorNamespace), + withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue}), + withNodeSelector(map[string]string{controlPlaneRoleKey: ""}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: map[string]string{controlPlaneRoleKey: ""}, + }, + { + name: "non-qualifying pod: not modified", + pod: makePod( + withLabels(map[string]string{"app": "some-other-app"}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: nil, + }, + { + name: "pod with no labels: not modified", + pod: makePod(), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: nil, + }, + { + name: "VPA operator label with wrong value: not modified", + pod: makePod( + withNamespace(vpaOperatorNamespace), + withLabels(map[string]string{vpaOperatorLabelKey: "some-other-operator"}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: nil, + }, + { + name: "VPA operator label in wrong namespace: not modified", + pod: makePod( + withNamespace("other-namespace"), + withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + expectedNodeSelector: nil, + }, + { + name: "non-pod resource: request is ignored", + pod: makePod( + withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue}), + ), + resource: coreapi.Resource("nodes").WithVersion("v1"), + expectedNodeSelector: nil, + }, + { + name: "pod subresource: request is ignored", + pod: makePod( + withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue}), + ), + resource: coreapi.Resource("pods").WithVersion("v1"), + subresource: "exec", + expectedNodeSelector: nil, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + plugin := &nodeSelectorAdjuster{ + Handler: admission.NewHandler(admission.Create), + } + + attrs := admission.NewAttributesRecord( + tc.pod, + nil, + schema.GroupVersionKind{}, + tc.pod.Namespace, + tc.pod.Name, + tc.resource, + tc.subresource, + admission.Create, + nil, + false, + fakeUser(), + ) + + if err := plugin.Admit(context.TODO(), attrs, nil); err != nil { + t.Fatalf("unexpected error: %v", err) + } + + // Verify node selector. + gotSelector := tc.pod.Spec.NodeSelector + if len(gotSelector) != len(tc.expectedNodeSelector) { + t.Errorf("node selector: expected %v, got %v", tc.expectedNodeSelector, gotSelector) + } else { + for k, v := range tc.expectedNodeSelector { + if gotSelector[k] != v { + t.Errorf("node selector key %q: expected %q, got %q", k, v, gotSelector[k]) + } + } + } + }) + } +} + +func TestRequiresNodeSelectorAdjustment(t *testing.T) { + tests := []struct { + name string + pod *coreapi.Pod + expected bool + }{ + { + name: "VPA operator label in correct namespace: match", + pod: makePod(withNamespace(vpaOperatorNamespace), withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue})), + expected: true, + }, + { + name: "VPA operator label in wrong namespace: no match", + pod: makePod(withNamespace("other-namespace"), withLabels(map[string]string{vpaOperatorLabelKey: vpaOperatorLabelValue})), + expected: false, + }, + { + name: "no labels: no match", + pod: makePod(), + expected: false, + }, + { + name: "unrelated labels: no match", + pod: makePod(withNamespace(vpaOperatorNamespace), withLabels(map[string]string{"app": "foo", "version": "v1"})), + expected: false, + }, + { + name: "VPA operator label with wrong value: no match", + pod: makePod(withNamespace(vpaOperatorNamespace), withLabels(map[string]string{vpaOperatorLabelKey: "some-other-operator"})), + expected: false, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + got := requiresNodeSelectorAdjustment(tc.pod) + if got != tc.expected { + t.Errorf("expected %v, got %v", tc.expected, got) + } + }) + } +} + +func TestIsStandalone(t *testing.T) { + tests := []struct { + name string + envValue string + expected bool + }{ + { + name: "env var set to 'openshift-kube-apiserver': IsStandalone returns true", + envValue: "openshift-kube-apiserver", + expected: true, + }, + { + name: "env var set to empty string: IsStandalone returns false", + envValue: "", + expected: false, + }, + { + name: "env var set to another namespace: IsStandalone returns false", + envValue: "clusters-my-cluster", + expected: false, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + t.Setenv(standaloneEnvVar, tc.envValue) + got := IsStandalone() + if got != tc.expected { + t.Errorf("expected %v, got %v", tc.expected, got) + } + }) + } +} + +// makePod constructs a coreapi.Pod, applying each option in order. +func makePod(opts ...func(*coreapi.Pod)) *coreapi.Pod { + p := &coreapi.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-pod", + Namespace: "test-namespace", + }, + } + for _, opt := range opts { + opt(p) + } + return p +} + +func withNamespace(ns string) func(*coreapi.Pod) { + return func(p *coreapi.Pod) { + p.Namespace = ns + } +} + +func withLabels(labels map[string]string) func(*coreapi.Pod) { + return func(p *coreapi.Pod) { + p.Labels = labels + } +} + +func withNodeSelector(selector map[string]string) func(*coreapi.Pod) { + return func(p *coreapi.Pod) { + p.Spec.NodeSelector = selector + } +} + +func fakeUser() user.Info { + return &user.DefaultInfo{Name: "testuser"} +} diff --git a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go index 7fd633402d..e15513521a 100644 --- a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go +++ b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go @@ -9,12 +9,17 @@ import ( "github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission" securityv1client "github.com/openshift/client-go/security/clientset/versioned" securityv1informer "github.com/openshift/client-go/security/informers/externalversions" + userclient "github.com/openshift/client-go/user/clientset/versioned" + userinformer "github.com/openshift/client-go/user/informers/externalversions" "github.com/openshift/library-go/pkg/apiserver/admission/admissionrestconfig" "github.com/openshift/library-go/pkg/apiserver/apiserverconfig" "k8s.io/apiserver/pkg/admission" genericapiserver "k8s.io/apiserver/pkg/server" clientgoinformers "k8s.io/client-go/informers" "k8s.io/client-go/rest" + "k8s.io/client-go/tools/cache" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers/usercache" "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" "k8s.io/kubernetes/openshift-kube-apiserver/enablement" @@ -44,6 +49,7 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k *pluginInitializers = append(*pluginInitializers, imagepolicy.NewInitializer(imagereferencemutators.KubeImageMutators{}, enablement.OpenshiftConfig().ImagePolicyConfig.InternalRegistryHostname), + restrictusers.NewInitializer(openshiftInformers.getOpenshiftUserInformers()), sccadmission.NewInitializer(openshiftInformers.getOpenshiftSecurityInformers().Security().V1().SecurityContextConstraints()), nodeenv.NewInitializer(enablement.OpenshiftConfig().ProjectConfig.DefaultNodeSelector), admissionrestconfig.NewInitializer(*rest.CopyConfig(genericConfig.LoopbackClientConfig)), @@ -101,6 +107,10 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e if err != nil { return nil, err } + userClient, err := userclient.NewForConfig(loopbackClientConfig) + if err != nil { + return nil, err + } // TODO find a single place to create and start informers. During the 1.7 rebase this will come more naturally in a config object, // before then we should try to eliminate our direct to storage access. It's making us do weird things. @@ -108,6 +118,12 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e ret := &kubeAPIServerInformers{ OpenshiftSecurityInformers: securityv1informer.NewSharedInformerFactory(securityClient, defaultInformerResyncPeriod), + OpenshiftUserInformers: userinformer.NewSharedInformerFactory(userClient, defaultInformerResyncPeriod), + } + if err := ret.OpenshiftUserInformers.User().V1().Groups().Informer().AddIndexers(cache.Indexers{ + usercache.ByUserIndexName: usercache.ByUserIndexKeys, + }); err != nil { + return nil, err } return ret, nil @@ -115,12 +131,17 @@ func newInformers(loopbackClientConfig *rest.Config) (*kubeAPIServerInformers, e type kubeAPIServerInformers struct { OpenshiftSecurityInformers securityv1informer.SharedInformerFactory + OpenshiftUserInformers userinformer.SharedInformerFactory } func (i *kubeAPIServerInformers) getOpenshiftSecurityInformers() securityv1informer.SharedInformerFactory { return i.OpenshiftSecurityInformers } +func (i *kubeAPIServerInformers) getOpenshiftUserInformers() userinformer.SharedInformerFactory { + return i.OpenshiftUserInformers +} func (i *kubeAPIServerInformers) Start(stopCh <-chan struct{}) { i.OpenshiftSecurityInformers.Start(stopCh) + i.OpenshiftUserInformers.Start(stopCh) } diff --git a/deps/k8s.io/klog/goroutine_labels.go b/deps/k8s.io/klog/goroutine_labels.go deleted file mode 100644 index 50f2235b56..0000000000 --- a/deps/k8s.io/klog/goroutine_labels.go +++ /dev/null @@ -1,7 +0,0 @@ -package klog - -import "k8s.io/klog/v2/internal/buffer" - -func WithMicroshiftLoggerComponent(c string, f func()) { - buffer.WithMicroshiftLoggerComponent(c, f) -} diff --git a/deps/k8s.io/klog/internal/buffer/buffer.go b/deps/k8s.io/klog/internal/buffer/buffer.go index 644af6eda9..46de00fb06 100644 --- a/deps/k8s.io/klog/internal/buffer/buffer.go +++ b/deps/k8s.io/klog/internal/buffer/buffer.go @@ -144,8 +144,6 @@ func (buf *Buffer) FormatHeader(s severity.Severity, file string, line int, now buf.Tmp[21] = ' ' buf.nDigits(7, 22, Pid, ' ') // TODO: should be TID buf.Tmp[29] = ' ' - buf.WriteString(getMicroshiftLoggerComponent()) - buf.WriteByte(' ') buf.Write(buf.Tmp[:30]) buf.WriteString(file) buf.Tmp[0] = ':' diff --git a/deps/k8s.io/klog/internal/buffer/goroutine_labels.go b/deps/k8s.io/klog/internal/buffer/goroutine_labels.go deleted file mode 100644 index 331946d5d3..0000000000 --- a/deps/k8s.io/klog/internal/buffer/goroutine_labels.go +++ /dev/null @@ -1,41 +0,0 @@ -package buffer - -import ( - "context" - "runtime/pprof" - "unsafe" -) - -//go:linkname runtime_getProfLabel runtime/pprof.runtime_getProfLabel -func runtime_getProfLabel() unsafe.Pointer - -// Definitions of 'label' and 'LabelSet' from /usr/local/go1.24.4/src/runtime/pprof/label.go - -type label struct { - key string - value string -} -type LabelSet struct { - list []label -} - -func getMicroshiftLoggerComponent() string { - labels := (*LabelSet)(runtime_getProfLabel()) - if labels == nil { - return "???" - } - - for _, label := range labels.list { - if label.key == "microshift_logger_component" { - return label.value - } - } - - return "???" -} - -func WithMicroshiftLoggerComponent(c string, f func()) { - pprof.Do(context.Background(), pprof.Labels("microshift_logger_component", c), func(context.Context) { - f() - }) -} diff --git a/go.mod b/go.mod index 3df196fb1d..f80abb74dd 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/openshift/microshift -go 1.25.0 +go 1.26.3 require ( github.com/apparentlymart/go-cidr v1.1.0 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // openshift-controller-manager github.com/google/go-cmp v0.7.0 github.com/miekg/dns v1.1.63 // microshift - github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9 + github.com/openshift/api v0.0.0-20260618181827-d22a47a846dc github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3 @@ -19,9 +19,9 @@ require ( github.com/vishvananda/netlink v1.3.1 go.etcd.io/etcd/client/pkg/v3 v3.6.8 go.etcd.io/etcd/client/v3 v3.6.8 - golang.org/x/sys v0.44.0 + golang.org/x/sys v0.46.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf + k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 sigs.k8s.io/knftables v0.0.20 sigs.k8s.io/yaml v1.6.0 ) @@ -34,8 +34,8 @@ require ( github.com/go-kit/kit v0.9.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 - github.com/openshift/cluster-policy-controller v0.0.0-20260420102459-bb429f5b2a7d - github.com/openshift/route-controller-manager v0.0.0-20260611182032-e454c01fbe56 + github.com/openshift/cluster-policy-controller v0.0.0-20260622225645-050c1ee6aeb0 + github.com/openshift/route-controller-manager v0.0.0-20260625182940-01ccbfb991fd github.com/prometheus/client_model v0.6.2 github.com/prometheus/common v0.67.5 github.com/prometheus/prometheus v0.302.1 @@ -90,7 +90,7 @@ require ( github.com/fatih/camelcase v1.0.0 // indirect github.com/felixge/fgprof v0.9.4 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fxamacker/cbor/v2 v2.9.0 // indirect + github.com/fxamacker/cbor/v2 v2.9.2 // indirect github.com/gabriel-vasile/mimetype v1.4.10 // indirect github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -172,10 +172,10 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.51.0 // indirect + golang.org/x/crypto v0.53.0 // indirect golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/term v0.43.0 // indirect + golang.org/x/term v0.44.0 // indirect golang.org/x/time v0.15.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect @@ -200,7 +200,7 @@ require ( sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/randfill v1.0.0 // indirect - sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect + sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect ) require ( @@ -225,11 +225,11 @@ require ( go.etcd.io/etcd/api/v3 v3.6.8 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect - golang.org/x/mod v0.35.0 // indirect - golang.org/x/net v0.54.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/text v0.37.0 // indirect - golang.org/x/tools v0.44.0 // indirect + golang.org/x/mod v0.36.0 // indirect + golang.org/x/net v0.56.0 // indirect + golang.org/x/sync v0.21.0 // indirect + golang.org/x/text v0.38.0 // indirect + golang.org/x/tools v0.45.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect google.golang.org/grpc v1.81.1 // indirect diff --git a/go.sum b/go.sum index 32c6a6492e..1cd720f1dd 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= -github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78= +github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0= github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo= @@ -314,24 +314,24 @@ github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.13.0 h1:Zza88GWezyT7RLql12URvoxsbLfjFx988+LGaWfbL84= github.com/opencontainers/selinux v1.13.0/go.mod h1:XxWTed+A/s5NNq4GmYScVy+9jzXhGBVEOAyucdRUY8s= -github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9 h1:yb8ul1HPFYhO04yp0D8T/qSySZnKv210f4nE//i/Bdg= -github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo= +github.com/openshift/api v0.0.0-20260618181827-d22a47a846dc h1:PpMpzCIXk/oIwu+ZnL4Kzuz8xP8yCX23NJQLwABLxv8= +github.com/openshift/api v0.0.0-20260618181827-d22a47a846dc/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo= github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31 h1:oYPQMrkzyk002L5aN8I2tkUHTEu9lsVrc1qiJmHJdXU= github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31/go.mod h1:mnTsMMTtXSPBQzqBp5HXBjLvliveKenRADFQy9m5jc0= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a h1:EKx2XhOKehd1C5ptY7IrLl4WV35E8kP0pRPnG5BUZXk= github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a/go.mod h1:V933kvY/cb/Un7UCEOhXHUySNX327u7Epe8g9KNqg2Q= -github.com/openshift/cluster-policy-controller v0.0.0-20260420102459-bb429f5b2a7d h1:IKzD+8sPwARWV4maM2oJ2IDbU99qQr1+53WyqpsWNxg= -github.com/openshift/cluster-policy-controller v0.0.0-20260420102459-bb429f5b2a7d/go.mod h1:aiLBVkadOsGJJcEKuQ+IYrypZF2a4ts2UpOEhQ0rndc= +github.com/openshift/cluster-policy-controller v0.0.0-20260622225645-050c1ee6aeb0 h1:xiFn9zzbm3/VkgUhWWsgmrasqS9oEjlMjMrrGF4DVNs= +github.com/openshift/cluster-policy-controller v0.0.0-20260622225645-050c1ee6aeb0/go.mod h1:JRqKW8k3s/1ErH5il6FACt7miJMh7pey5HBLDOgIhPo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 h1:4gZibdvRUsxsQ55Tp+HFRjVzkYh+bcRezmYqhiCMk4U= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775/go.mod h1:o5cKv/pQ+exEYKq97WapNa5cxSPxuwBezHZHNW5RNRo= github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3 h1:AHjJETxL4n2ocMHBY7Epqex574puUSJjKIUkbasYAKI= github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3/go.mod h1:gKG9lctU0yEftSoT3DUyeIWz1oAgF0EHUpwI4pnCo4o= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 h1:02E4Ttpu+7yCQLQxtY42JfcfHU7TBGnje6uB2ytBSdU= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= -github.com/openshift/route-controller-manager v0.0.0-20260611182032-e454c01fbe56 h1:hX5oJuUnVXDk3FBDiMiteZWy+b+JSP7UcQdlcqBSD/o= -github.com/openshift/route-controller-manager v0.0.0-20260611182032-e454c01fbe56/go.mod h1:D5jarnF94awXjzy6WNR/pImmNof2fuyI612hqjhfy/4= +github.com/openshift/route-controller-manager v0.0.0-20260625182940-01ccbfb991fd h1:pVqwIlbU2dXko5CS503EBxj1ed1IRsUhoAZ750dGtGI= +github.com/openshift/route-controller-manager v0.0.0-20260625182940-01ccbfb991fd/go.mod h1:Egyc4t20carc7zG6JilffbVkJix8NKkmS2J5+vvFUoo= github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/ovn-kubernetes/libovsdb v0.8.2-0.20260302130604-c07ce22366ac h1:D7Ex9/u5HMz+xvqel1RCCO1AxVG7XRAx9AcP02/nyzk= github.com/ovn-kubernetes/libovsdb v0.8.2-0.20260302130604-c07ce22366ac/go.mod h1:x2keWyG0K1WmZeZLRh+z4fWwcqp99Yu9/HAiMucj5D0= @@ -459,27 +459,27 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= -golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= +golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0= golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= -golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= +golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= +golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= -golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= +golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= +golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -490,22 +490,22 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= -golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= -golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= +golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc= +golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= +golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= +golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= +golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM= golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM= @@ -542,8 +542,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ= k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM= -k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf h1:btPscg4cMql0XdYK2jLsJcNEKmACJz8l+U7geC06FiM= -k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= +k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 h1:JVogoTvOj6gutlx8bUwGh0e8o8L4X8nDbTLyONmoVvk= +k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974/go.mod h1:V/QaCUYDa+0QpcHhVVc5l99Uz56wEMEXBSj9oCDkNDY= k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU= k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 h1:hSfpvjjTQXQY2Fol2CS0QHMNs/WI1MOSGzCm1KhM5ec= @@ -558,7 +558,7 @@ sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= -sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8= -sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= +sigs.k8s.io/structured-merge-diff/v6 v6.4.0 h1:qmp2e3ZfFi1/jJbDGpD4mt3wyp6PE1NfKHCYLqgNQJo= +sigs.k8s.io/structured-merge-diff/v6 v6.4.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/rebase.log b/rebase.log new file mode 100644 index 0000000000..21ce3fe30d --- /dev/null +++ b/rebase.log @@ -0,0 +1,762 @@ +rebase.sh: +# Rebasing to registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-07-01-125918 and registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-07-02-035219 +# Fetching release info for registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-07-01-125918 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-07-02-035219 (arm64) +# Extracting registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-07-01-125918 manifest content +# Cloning registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-07-01-125918 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/api/.git/ +HEAD is now at 6bba8bc8 Merge pull request #2898 from maxcao13/fg-karpenter-operator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-csi-snapshot-controller-operator/.git/ +HEAD is now at d7262f2 Merge pull request #276 from ingvagabund/cvo-injected-tls-configuration + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 8395f90 Merge pull request #478 from openshift-bot/art-consistency-openshift-5.0-ose-cluster-dns-operator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 6d4e06c4 Merge pull request #1475 from aswinsuryan/OCPBUGS-86833/detect-orphaned-ossm-subscription + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 6ffdb07 Merge pull request #2214 from ardaguclu/bump-library-go + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 8bef981 Merge pull request #946 from tchap/fix/error-wrapping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at d43423b Merge pull request #637 from kaleemsiddiqu/network-policy-tests + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at 7b341b4 Merge pull request #3001 from danwinship/default-networkpolicies-3 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at 34f95b0 Merge pull request #428 from kaleemsiddiqu/network-policy-tests + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at 050c1ee Merge pull request #190 from atiratree/owners + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/csi-external-snapshotter/.git/ +HEAD is now at b5e4b73 Merge pull request #224 from rvagner78/rebase-v8.6.0-no-subtree-check + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at bf6c0094 Merge pull request #384 from openshift-bot/art-consistency-openshift-5.0-ose-etcd + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at a466682e3 Merge pull request #2694 from not-stbenjam/fix-kubernetes-conformance-suite + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes-kube-storage-version-migrator/.git/ +HEAD is now at 72835e4 Merge pull request #237 from sanchezl/leader-election-2026 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at f05e4873 Merge pull request #6203 from pablintino/remove-deadcode + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at 5631cf4 Merge pull request #422 from sebrandon1/ioutil_deprecation + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/operator-framework-olm/.git/ +HEAD is now at cea3be72 Merge pull request #1335 from tmshort/synchronize + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at 01ccbfb Merge pull request #98 from aswinsuryan/OCPBUGS-87336-go-1.26 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at 6391e07 Merge pull request #359 from ingvagabund/cvo-injected-tls-configuration + +# Cloning registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-07-01-125918 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at a7ad5724 Merge pull request #2293 from tchap/contextualization + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at 97f7cc3 Merge pull request #188 from aswinsuryan/add-to-owners + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-snapshotter/.git/ +HEAD is now at b5e4b73 Merge pull request #224 from rvagner78/rebase-v8.6.0-no-subtree-check + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 92a1fe6 Merge pull request #780 from jcmoraisjr/NE-2664-haproxy28-image + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at d12e274 Merge pull request #133 from ibihim/merge-v0.21.1-downstream + +lvms_operator not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/ +HEAD is now at f0527039 Merge pull request #3178 from pperiyasamy/evpn_e2s_blocking + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at a466682e3 Merge pull request #2694 from not-stbenjam/fix-kubernetes-conformance-suite + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at 6391e07 Merge pull request #359 from ingvagabund/cvo-injected-tls-configuration + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at a7ad5724 Merge pull request #2293 from tchap/contextualization + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at 97f7cc3 Merge pull request #188 from aswinsuryan/add-to-owners + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-snapshotter/.git/ +HEAD is now at b5e4b73 Merge pull request #224 from rvagner78/rebase-v8.6.0-no-subtree-check + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at 92a1fe6 Merge pull request #780 from jcmoraisjr/NE-2664-haproxy28-image + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at d12e274 Merge pull request #133 from ibihim/merge-v0.21.1-downstream + +lvms_operator not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/ +HEAD is now at 6617c2a2 Merge pull request #3258 from miheer/CORENET-6688 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at a466682e3 Merge pull request #2694 from not-stbenjam/fix-kubernetes-conformance-suite + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at 6391e07 Merge pull request #359 from ingvagabund/cvo-injected-tls-configuration + +Warning: env var PULL_BASE_REF not found or empty, falling back to local active branch. +error: branch 'rebase-release-5.0-5.0.0-0.nightly-2026-07-01-125918_amd64-2026-07-01_arm64-2026-07-02' not found +Switched to a new branch 'rebase-release-5.0-5.0.0-0.nightly-2026-07-01-125918_amd64-2026-07-01_arm64-2026-07-02' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-release-5.0-5.0.0-0.nightly-2026-07-01-125918_amd64-2026-07-01_arm64-2026-07-02 7cdfe7e2b] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-csi-snapshot-controller-operator embedded-component no change + +cluster-dns-operator embedded-component no change + +cluster-kube-scheduler-operator embedded-component no change + +cluster-openshift-controller-manager-operator embedded-component no change + +etcd embedded-component no change + +kubernetes-kube-storage-version-migrator embedded-component no change + +openshift-controller-manager embedded-component no change + +coredns image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +coredns image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +kubernetes image-arm64 no change + +## Committing changes to changelog +[rebase-release-5.0-5.0.0-0.nightly-2026-07-01-125918_amd64-2026-07-01_arm64-2026-07-02 3e3f946aa] update changelog + 2 files changed, 187 insertions(+), 24 deletions(-) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@050c1ee6aeb0838daf75858fd853cca1e0098fa9 +go: downloading sigs.k8s.io/yaml v1.6.0 +go: downloading github.com/stretchr/testify v1.11.1 +go: downloading github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9 +go: downloading github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a +go: downloading github.com/fsnotify/fsnotify v1.9.0 +go: downloading github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3 +go: downloading github.com/vishvananda/netlink v1.3.1 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 +go: downloading github.com/spf13/cobra v1.10.2 +go: downloading go.etcd.io/etcd/client/pkg/v3 v3.6.8 +go: downloading go.etcd.io/etcd/client/v3 v3.6.8 +go: downloading github.com/spf13/pflag v1.0.10 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading github.com/squat/generic-device-plugin v0.0.0-20251019101956-043a51e18f31 +go: downloading github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af +go: downloading sigs.k8s.io/kustomize/kyaml v0.20.1 +go: downloading github.com/cenkalti/backoff/v4 v4.3.0 +go: downloading github.com/go-kit/kit v0.9.0 +go: downloading github.com/ovn-kubernetes/libovsdb v0.8.2-0.20260302130604-c07ce22366ac +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20260622225645-050c1ee6aeb0 +go: downloading sigs.k8s.io/kustomize/api v0.20.1 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20260611182032-e454c01fbe56 +go: downloading golang.org/x/sys v0.44.0 +go: downloading sigs.k8s.io/knftables v0.0.20 +go: downloading github.com/coreos/go-systemd/v22 v22.7.0 +go: downloading github.com/miekg/dns v1.1.63 +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading github.com/gogo/protobuf v1.3.2 +go: downloading github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 +go: downloading k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf +go: downloading github.com/golang/snappy v0.0.4 +go: downloading github.com/google/go-cmp v0.7.0 +go: downloading github.com/prometheus/client_model v0.6.2 +go: downloading github.com/prometheus/common v0.67.5 +go: downloading github.com/prometheus/prometheus v0.302.1 +go: downloading github.com/go-logr/logr v1.4.3 +go: downloading sigs.k8s.io/randfill v1.0.0 +go: downloading sigs.k8s.io/structured-merge-diff/v6 v6.3.2 +go: downloading go.yaml.in/yaml/v2 v2.4.4 +go: downloading go.yaml.in/yaml/v3 v3.0.4 +go: downloading github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc +go: downloading github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 +go: downloading github.com/vishvananda/netns v0.0.5 +go: downloading github.com/fxamacker/cbor/v2 v2.9.0 +go: downloading gopkg.in/evanphx/json-patch.v4 v4.13.0 +go: downloading github.com/google/gnostic-models v0.7.1 +go: downloading google.golang.org/protobuf v1.36.11 +go: downloading golang.org/x/term v0.43.0 +go: downloading github.com/inconshreveable/mousetrap v1.1.0 +go: downloading go.uber.org/zap v1.27.1 +go: downloading github.com/google/uuid v1.6.0 +go: downloading github.com/coreos/go-semver v0.3.1 +go: downloading go.etcd.io/etcd/api/v3 v3.6.8 +go: downloading google.golang.org/grpc v1.81.1 +go: downloading github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 +go: downloading gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c +go: downloading sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading golang.org/x/net v0.54.0 +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/go-kit/log v0.2.1 +go: downloading github.com/oklog/run v1.2.0 +go: downloading github.com/prometheus/client_golang v1.23.2 +go: downloading go.opentelemetry.io/otel/trace v1.43.0 +go: downloading golang.org/x/time v0.15.0 +go: downloading github.com/cenkalti/rpc2 v1.0.5 +go: downloading github.com/go-playground/validator/v10 v10.28.0 +go: downloading github.com/go-logr/stdr v1.2.2 +go: downloading github.com/go-logfmt/logfmt v0.5.1 +go: downloading go.opentelemetry.io/otel v1.43.0 +go: downloading github.com/go-stack/stack v1.8.1 +go: downloading go.uber.org/goleak v1.3.0 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading github.com/moby/term v0.5.0 +go: downloading github.com/blang/semver/v4 v4.0.0 +go: downloading github.com/lithammer/dedent v1.1.0 +go: downloading github.com/jonboulle/clockwork v0.5.0 +go: downloading github.com/MakeNowJust/heredoc v1.0.0 +go: downloading github.com/mitchellh/go-wordwrap v1.0.1 +go: downloading github.com/russross/blackfriday/v2 v2.1.0 +go: downloading github.com/google/cadvisor v0.53.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 +go: downloading go.opentelemetry.io/otel/metric v1.43.0 +go: downloading go.opentelemetry.io/otel/sdk v1.43.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 +go: downloading github.com/godbus/dbus/v5 v5.1.0 +go: downloading golang.org/x/tools v0.44.0 +go: downloading golang.org/x/sync v0.20.0 +go: downloading github.com/Microsoft/go-winio v0.6.2 +go: downloading k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/prometheus/procfs v0.20.1 +go: downloading github.com/x448/float16 v0.8.4 +go: downloading github.com/go-openapi/swag v0.25.5 +go: downloading golang.org/x/text v0.37.0 +go: downloading github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading go.uber.org/multierr v1.11.0 +go: downloading github.com/golang/protobuf v1.5.4 +go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 +go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 +go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 +go: downloading github.com/stretchr/objx v0.5.2 +go: downloading github.com/chai2010/gettext-go v1.0.2 +go: downloading golang.org/x/oauth2 v0.36.0 +go: downloading github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 +go: downloading github.com/onsi/gomega v1.38.2 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f +go: downloading github.com/kr/pretty v0.3.1 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.2.1 +go: downloading gopkg.in/go-jose/go-jose.v2 v2.6.3 +go: downloading github.com/emicklei/go-restful/v3 v3.13.0 +go: downloading go.etcd.io/etcd/server/v3 v3.6.5 +go: downloading github.com/go-openapi/jsonreference v0.21.5 +go: downloading github.com/onsi/ginkgo v1.16.5 +go: downloading github.com/go-errors/errors v1.4.2 +go: downloading github.com/pkg/profile v1.7.0 +go: downloading github.com/sirupsen/logrus v1.9.3 +go: downloading go.uber.org/atomic v1.11.0 +go: downloading golang.org/x/crypto v0.51.0 +go: downloading github.com/cenkalti/hub v1.0.2 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.3.0 +go: downloading github.com/gabriel-vasile/mimetype v1.4.10 +go: downloading github.com/go-playground/universal-translator v0.18.1 +go: downloading github.com/leodido/go-urn v1.4.0 +go: downloading github.com/go-playground/assert/v2 v2.2.0 +go: downloading github.com/go-playground/locales v0.14.1 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 +go: downloading github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31 +go: downloading github.com/creack/pty v1.1.18 +go: downloading github.com/google/cel-go v0.27.0 +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/robfig/cron v1.2.0 +go: downloading github.com/opencontainers/selinux v1.13.0 +go: downloading github.com/container-storage-interface/spec v1.9.0 +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading go.opentelemetry.io/proto/otlp v1.9.0 +go: downloading go.opentelemetry.io/otel/sdk/metric v1.43.0 +go: downloading github.com/opencontainers/cgroups v0.0.3 +go: downloading github.com/cyphar/filepath-securejoin v0.6.0 +go: downloading github.com/moby/sys/userns v0.1.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0 +go: downloading github.com/docker/go-units v0.5.0 +go: downloading github.com/moby/sys/mountinfo v0.7.2 +go: downloading github.com/karrick/godirwalk v1.17.0 +go: downloading github.com/containerd/containerd/api v1.9.0 +go: downloading github.com/containerd/errdefs v1.0.0 +go: downloading github.com/containerd/errdefs/pkg v0.3.0 +go: downloading github.com/opencontainers/runtime-spec v1.2.1 +go: downloading github.com/containerd/typeurl/v2 v2.2.3 +go: downloading golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated +go: downloading github.com/klauspost/compress v1.18.0 +go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd +go: downloading github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee +go: downloading github.com/kylelemons/godebug v1.1.0 +go: downloading github.com/go-openapi/swag/cmdutils v0.25.5 +go: downloading github.com/go-openapi/swag/conv v0.25.5 +go: downloading github.com/go-openapi/swag/fileutils v0.25.5 +go: downloading github.com/go-openapi/swag/jsonname v0.25.5 +go: downloading github.com/go-openapi/swag/jsonutils v0.25.5 +go: downloading github.com/go-openapi/swag/loading v0.25.5 +go: downloading github.com/go-openapi/swag/mangling v0.25.5 +go: downloading github.com/go-openapi/swag/netutils v0.25.5 +go: downloading github.com/go-openapi/swag/stringutils v0.25.5 +go: downloading github.com/go-openapi/swag/typeutils v0.25.5 +go: downloading github.com/go-openapi/swag/yamlutils v0.25.5 +go: downloading github.com/go-openapi/testify/v2 v2.4.0 +go: downloading github.com/google/btree v1.1.3 +go: downloading github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc +go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 +go: downloading github.com/kr/text v0.2.0 +go: downloading github.com/rogpeppe/go-internal v1.14.1 +go: downloading github.com/coreos/go-oidc v2.3.0+incompatible +go: downloading github.com/go-openapi/jsonpointer v0.22.5 +go: downloading github.com/go-logr/zapr v1.3.0 +go: downloading github.com/felixge/fgprof v0.9.4 +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/soheilhy/cmux v0.1.5 +go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 +go: downloading go.etcd.io/bbolt v1.4.3 +go: downloading go.etcd.io/etcd/pkg/v3 v3.6.5 +go: downloading github.com/felixge/httpsnoop v1.0.4 +go: downloading github.com/moby/spdystream v0.5.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 +go: downloading github.com/distribution/reference v0.6.0 +go: downloading cel.dev/expr v0.25.1 +go: downloading github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 +go: downloading go.opentelemetry.io/auto/sdk v1.2.1 +go: downloading github.com/cenkalti/backoff/v5 v5.0.3 +go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab +go: downloading github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 +go: downloading github.com/Microsoft/hnslib v0.1.2 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.19.0 +go: downloading github.com/containerd/ttrpc v1.2.7 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/sergi/go-diff v1.2.0 +go: downloading golang.org/x/tools/go/expect v0.1.1-deprecated +go: downloading github.com/go-openapi/testify/enable/yaml/v2 v2.4.0 +go: downloading github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.5 +go: downloading golang.org/x/mod v0.35.0 +go: downloading github.com/pquerna/cachecontrol v0.1.0 +go: downloading github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 +go: downloading github.com/Masterminds/semver/v3 v3.4.0 +go: downloading github.com/dustin/go-humanize v1.0.1 +go: downloading go.etcd.io/raft/v3 v3.6.0 +go: downloading github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 +go: downloading github.com/antlr4-go/antlr/v4 v4.13.1 +go: downloading cyphar.com/go-pathrs v0.2.1 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading github.com/docker/docker v28.2.2+incompatible +go: downloading github.com/docker/go-connections v0.5.0 +go: downloading github.com/opencontainers/image-spec v1.1.1 +go: downloading github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 +go: downloading github.com/xlab/treeprint v1.2.0 +go: downloading gonum.org/v1/gonum v0.17.0 +go: downloading github.com/containerd/log v0.1.0 +go: downloading github.com/go-task/slim-sprig/v3 v3.0.0 +go: downloading github.com/golang-jwt/jwt/v5 v5.3.0 +go: downloading github.com/go-ldap/ldap/v3 v3.4.11 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 +go: downloading golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa +go: downloading github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 +go: downloading github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 +go: downloading github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa +go: downloading github.com/jcmturner/gokrb5/v8 v8.4.4 +go: downloading github.com/jcmturner/gofork v1.7.6 +go: downloading github.com/hashicorp/go-uuid v1.0.3 +go: downloading github.com/jcmturner/dnsutils/v2 v2.0.0 +go: downloading github.com/jcmturner/goidentity/v6 v6.0.1 +go: downloading github.com/jcmturner/aescts/v2 v2.0.0 +go: downloading github.com/jcmturner/rpc/v2 v2.0.3 +go: downloading github.com/moby/docker-image-spec v1.3.1 +go: downloading github.com/openshift/api v0.0.0-20260618181827-d22a47a846dc +go: downloading golang.org/x/sys v0.46.0 +go: downloading k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 +go: downloading sigs.k8s.io/structured-merge-diff/v6 v6.4.0 +go: downloading github.com/fxamacker/cbor/v2 v2.9.2 +go: downloading golang.org/x/term v0.44.0 +go: downloading golang.org/x/net v0.56.0 +go: downloading golang.org/x/tools v0.45.0 +go: downloading golang.org/x/sync v0.21.0 +go: downloading golang.org/x/text v0.38.0 +go: downloading golang.org/x/crypto v0.53.0 +go: downloading golang.org/x/mod v0.36.0 +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20251120221002-696928a6a0d7 +Handling 'k8s.io/klog/v2' dep: cloning 'https://github.com/kubernetes/klog' @ 'v2.130.1' to /go/src/github.com/openshift/microshift/./deps/k8s.io/klog +Cloning into '/go/src/github.com/openshift/microshift/./deps/k8s.io/klog'... +Handling 'k8s.io/kubernetes' dep: copying /go/src/github.com/openshift/microshift/_output/staging/kubernetes -> /go/src/github.com/openshift/microshift/./deps/github.com/openshift/kubernetes +go mod edit -replace sigs.k8s.io/kube-storage-version-migrator=github.com/openshift/kubernetes-kube-storage-version-migrator@72835e43c7754356645e41031f3a99926b4d42e6 +Handling 'k8s.io/api' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/apiextensions-apiserver' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/apimachinery' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/apiserver' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/cli-runtime' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/client-go' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/cloud-provider' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/cluster-bootstrap' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/code-generator' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/component-base' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/component-helpers' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/controller-manager' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/cri-api' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/cri-client' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/csi-translation-lib' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/dynamic-resource-allocation' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/endpointslice' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/externaljwt' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kms' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kube-aggregator' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kube-controller-manager' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kube-proxy' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kube-scheduler' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kubectl' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/kubelet' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/metrics' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/mount-utils' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/pod-security-admission' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/sample-apiserver' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/sample-cli-plugin' dep: updating required version to '1.35.3' (for information purposes) +Handling 'k8s.io/sample-controller' dep: updating required version to '1.35.3' (for information purposes) +go mod edit -require github.com/openshift/route-controller-manager@01ccbfb991fdbc559820a04c4932fc5ddf2339d0 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20260625182940-01ccbfb991fd +go mod edit -require github.com/openshift/cluster-policy-controller@050c1ee6aeb0838daf75858fd853cca1e0098fa9 +go: inconsistent vendoring in /go/src/github.com/openshift/microshift: + github.com/openshift/api@v0.0.0-20260618181827-d22a47a846dc: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/sys@v0.46.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + k8s.io/kube-openapi@v0.0.0-20260618221249-bc653b64f974: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/openshift/cluster-policy-controller@v0.0.0-20260622225645-050c1ee6aeb0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/openshift/route-controller-manager@v0.0.0-20260625182940-01ccbfb991fd: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/fxamacker/cbor/v2@v2.9.2: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/crypto@v0.53.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/term@v0.44.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + sigs.k8s.io/structured-merge-diff/v6@v6.4.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/mod@v0.36.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/net@v0.56.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/sync@v0.21.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/text@v0.38.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/tools@v0.45.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/fxamacker/cbor/v2@v2.9.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + github.com/openshift/api@v0.0.0-20260511191110-9b69e5fa27e9: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + github.com/openshift/cluster-policy-controller@v0.0.0-20260420102459-bb429f5b2a7d: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + github.com/openshift/route-controller-manager@v0.0.0-20260611182032-e454c01fbe56: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/crypto@v0.51.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/mod@v0.35.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/net@v0.54.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/sync@v0.20.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/sys@v0.44.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/term@v0.43.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/text@v0.37.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/tools@v0.44.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + k8s.io/kube-openapi@v0.0.0-20260304202019-5b3e3fdb0acf: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + sigs.k8s.io/structured-merge-diff/v6@v6.3.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + + To ignore the vendor directory, use -mod=readonly or -mod=mod. + To sync the vendor directory, run: + go mod vendor +panic: runtime error: invalid memory address or nil pointer dereference +[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x9f7f2c] + +goroutine 1 [running]: +cmd/go/internal/doc.findCodeRoots() + cmd/go/internal/doc/dirs.go:234 +0x74c +cmd/go/internal/doc.codeRoots.func1() + cmd/go/internal/doc/dirs.go:175 +0xf +sync.(*Once).doSlow(0xbadb20?, 0x31ca86f20001?) + sync/once.go:78 +0xac +sync.(*Once).Do(...) + sync/once.go:69 +cmd/go/internal/doc.codeRoots() + cmd/go/internal/doc/dirs.go:174 +0x2c +cmd/go/internal/doc.dirsInit({0x0, 0x0, 0x31ca86fca000?}) + cmd/go/internal/doc/dirs.go:58 +0x305 +cmd/go/internal/doc.runDoc({0xc8d240?, 0x122afc0?}, 0x31ca86e3c918?, {0x31ca86e38290, 0x1, 0x1}) + cmd/go/internal/doc/doc.go:152 +0x72 +main.invoke(0x11ac500, {0x31ca86e38280, 0x2, 0x2}) + cmd/go/main.go:340 +0x8f9 +main.main() + cmd/go/main.go:219 +0xed6 +Running `gofmt -s -l -w` on 910 file(s). +./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go +./deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go +./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go +./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go +go: inconsistent vendoring in /go/src/github.com/openshift/microshift: + github.com/openshift/api@v0.0.0-20260618181827-d22a47a846dc: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/sys@v0.46.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + k8s.io/kube-openapi@v0.0.0-20260618221249-bc653b64f974: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/openshift/cluster-policy-controller@v0.0.0-20260622225645-050c1ee6aeb0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/openshift/route-controller-manager@v0.0.0-20260625182940-01ccbfb991fd: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/fxamacker/cbor/v2@v2.9.2: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/crypto@v0.53.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/term@v0.44.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + sigs.k8s.io/structured-merge-diff/v6@v6.4.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/mod@v0.36.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/net@v0.56.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/sync@v0.21.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/text@v0.38.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + golang.org/x/tools@v0.45.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + github.com/fxamacker/cbor/v2@v2.9.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + github.com/openshift/api@v0.0.0-20260511191110-9b69e5fa27e9: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + github.com/openshift/cluster-policy-controller@v0.0.0-20260420102459-bb429f5b2a7d: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + github.com/openshift/route-controller-manager@v0.0.0-20260611182032-e454c01fbe56: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/crypto@v0.51.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/mod@v0.35.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/net@v0.54.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/sync@v0.20.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/sys@v0.44.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/term@v0.43.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/text@v0.37.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + golang.org/x/tools@v0.44.0: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + k8s.io/kube-openapi@v0.0.0-20260304202019-5b3e3fdb0acf: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + sigs.k8s.io/structured-merge-diff/v6@v6.3.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod + + To ignore the vendor directory, use -mod=readonly or -mod=mod. + To sync the vendor directory, run: + go mod vendor +panic: runtime error: invalid memory address or nil pointer dereference +[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x9f7f2c] + +goroutine 1 [running]: +cmd/go/internal/doc.findCodeRoots() + cmd/go/internal/doc/dirs.go:234 +0x74c +cmd/go/internal/doc.codeRoots.func1() + cmd/go/internal/doc/dirs.go:175 +0xf +sync.(*Once).doSlow(0xbadb20?, 0x248a6289c001?) + sync/once.go:78 +0xac +sync.(*Once).Do(...) + sync/once.go:69 +cmd/go/internal/doc.codeRoots() + cmd/go/internal/doc/dirs.go:174 +0x2c +cmd/go/internal/doc.dirsInit({0x0, 0x0, 0x248a62836000?}) + cmd/go/internal/doc/dirs.go:58 +0x305 +cmd/go/internal/doc.runDoc({0xc8d240?, 0x122afc0?}, 0x248a626a8918?, {0x248a626a4290, 0x1, 0x1}) + cmd/go/internal/doc/doc.go:152 +0x72 +main.invoke(0x11ac500, {0x248a626a4280, 0x2, 0x2}) + cmd/go/main.go:340 +0x8f9 +main.main() + cmd/go/main.go:219 +0xed6 +for p in scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch scripts/auto-rebase/rebase_patches/0006-kcm-no-panic.patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch; do \ + echo "Applying patch $p"; \ + git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply --reject || exit 1; \ +done +Applying patch scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch +Checking patch deps/github.com/openshift/kubernetes/pkg/volume/csi/csi_plugin.go... +Hunk #1 succeeded at 347 (offset 2 lines). +Applied patch deps/github.com/openshift/kubernetes/pkg/volume/csi/csi_plugin.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch +Checking patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Hunk #2 succeeded at 33 (offset 1 line). +Hunk #3 succeeded at 86 (offset 2 lines). +Applied patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch +Checking patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Hunk #2 succeeded at 26 (offset 1 line). +Hunk #3 succeeded at 50 (offset 1 line). +Hunk #4 succeeded at 109 (offset 2 lines). +Hunk #5 succeeded at 127 (offset 2 lines). +Hunk #6 succeeded at 141 (offset 2 lines). +Hunk #7 succeeded at 157 (offset 2 lines). +Applied patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch +Checking patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Checking patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go... +error: while searching for: + projectnodeenv "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv" + schedulerpodnodeconstraints "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/podnodeconstraints" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/performantsecuritypolicy" +) + +func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) { + +error: patch failed: deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go:24 +Hunk #3 succeeded at 33 (offset 2 lines). +error: while searching for: + externalipranger.RegisterExternalIP(plugins) + restrictedendpoints.RegisterRestrictedEndpoints(plugins) + csiinlinevolumesecurity.Register(plugins) + performantsecuritypolicy.Register(plugins) +} + +var ( + +error: patch failed: deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go:45 +error: while searching for: + "security.openshift.io/SecurityContextConstraint", + "security.openshift.io/SCCExecRestrictions", + "route.openshift.io/IngressAdmission", + hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment" + csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity" + managednode.PluginName, // "autoscaling.openshift.io/ManagedNode" + mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs" + performantsecuritypolicy.PluginName, // "storage.openshift.io/PerformantSecurityPolicy" + } + + // openshiftAdmissionPluginsForKubeAfterResourceQuota are the plugins to add after ResourceQuota plugin + +error: patch failed: deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go:75 +Applied patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go with 3 rejects... +Hunk #1 applied cleanly. +Rejected hunk #2. +Hunk #3 applied cleanly. +Rejected hunk #4. +Rejected hunk #5. +make: *** [Makefile:318: patch-deps] Error 1 +================================================== +rebase_ai_model_serving.sh: +Rebasing AI Model Serving for MicroShift to registry.redhat.io/rhoai/odh-operator-bundle:v2.25 +Fetching RHOAI CSV +Fetching RHOAI manifests +Updating last_rebase_ai_model_serving.sh +Updating rebase_job_entrypoint.sh +Copying manifests from staging dir to assets/ +2026-07-02 04:40:10,432 INFO Not clearing dir optional/ai-model-serving/ +2026-07-02 04:40:10,433 WARNING Ignoring optional/ai-model-serving/release-ai-model-serving-x86_64.json because Release info file +2026-07-02 04:40:10,433 INFO Not clearing dir optional/ai-model-serving/kserve/ +2026-07-02 04:40:10,433 WARNING Ignoring optional/ai-model-serving/kserve/kustomization.yaml because MicroShift specific overrides +2026-07-02 04:40:10,433 WARNING Ignoring optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml because MicroShift specific overrides +2026-07-02 04:40:10,433 WARNING Ignoring optional/ai-model-serving/kserve/namespace.yaml because MicroShift specific overrides +2026-07-02 04:40:10,433 INFO Clearing directory assets/optional/ai-model-serving/kserve/overlays/odh/ +2026-07-02 04:40:10,434 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/kustomization.yaml +2026-07-02 04:40:10,434 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/llm-svc-scc.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/llm-svc-scc.yaml +2026-07-02 04:40:10,434 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/network-policies.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/network-policies.yaml +2026-07-02 04:40:10,435 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/params.env <- _output/staging/rhoai/operator/kserve/overlays/odh/params.env +2026-07-02 04:40:10,435 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/params.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/params.yaml +2026-07-02 04:40:10,435 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/user-cluster-roles.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/user-cluster-roles.yaml +2026-07-02 04:40:10,435 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml +2026-07-02 04:40:10,435 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-set-resources-manager.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/patch-set-resources-manager.yaml +2026-07-02 04:40:10,436 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-webhook-svc-openshift-cert-injection.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/patch-webhook-svc-openshift-cert-injection.yaml +2026-07-02 04:40:10,436 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/remove-cert-manager.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/remove-cert-manager.yaml +2026-07-02 04:40:10,436 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/remove-clusterservingruntime.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/remove-clusterservingruntime.yaml +2026-07-02 04:40:10,436 DEBUG Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/remove-local-model.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/remove-local-model.yaml +2026-07-02 04:40:10,436 INFO Clearing directory assets/optional/ai-model-serving/kserve/default/ +2026-07-02 04:40:10,437 DEBUG Copying assets/optional/ai-model-serving/kserve/default/cainjection_conversion_webhook.yaml <- _output/staging/rhoai/operator/kserve/default/cainjection_conversion_webhook.yaml +2026-07-02 04:40:10,437 DEBUG Copying assets/optional/ai-model-serving/kserve/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,438 DEBUG Copying assets/optional/ai-model-serving/kserve/default/inferencegraph_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/inferencegraph_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,438 DEBUG Copying assets/optional/ai-model-serving/kserve/default/isvc_mutatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/isvc_mutatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,438 DEBUG Copying assets/optional/ai-model-serving/kserve/default/isvc_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/isvc_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,438 DEBUG Copying assets/optional/ai-model-serving/kserve/default/kustomization.yaml <- _output/staging/rhoai/operator/kserve/default/kustomization.yaml +2026-07-02 04:40:10,438 DEBUG Copying assets/optional/ai-model-serving/kserve/default/llmisvcconfig_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/llmisvcconfig_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,439 DEBUG Copying assets/optional/ai-model-serving/kserve/default/llmisvc_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/llmisvc_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,439 DEBUG Copying assets/optional/ai-model-serving/kserve/default/localmodelcache_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodelcache_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,439 DEBUG Copying assets/optional/ai-model-serving/kserve/default/localmodel_manager_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodel_manager_image_patch.yaml +2026-07-02 04:40:10,439 DEBUG Copying assets/optional/ai-model-serving/kserve/default/localmodelnode_agent_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodelnode_agent_image_patch.yaml +2026-07-02 04:40:10,439 DEBUG Copying assets/optional/ai-model-serving/kserve/default/manager_auth_proxy_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_auth_proxy_patch.yaml +2026-07-02 04:40:10,439 DEBUG Copying assets/optional/ai-model-serving/kserve/default/manager_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_image_patch.yaml +2026-07-02 04:40:10,440 DEBUG Copying assets/optional/ai-model-serving/kserve/default/manager_prometheus_metrics_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_prometheus_metrics_patch.yaml +2026-07-02 04:40:10,440 DEBUG Copying assets/optional/ai-model-serving/kserve/default/manager_resources_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_resources_patch.yaml +2026-07-02 04:40:10,440 DEBUG Copying assets/optional/ai-model-serving/kserve/default/servingruntime_validationwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/servingruntime_validationwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,440 DEBUG Copying assets/optional/ai-model-serving/kserve/default/trainedmodel_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/trainedmodel_validatingwebhook_cainjection_patch.yaml +2026-07-02 04:40:10,440 INFO Clearing directory assets/optional/ai-model-serving/kserve/crd/ +2026-07-02 04:40:10,442 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/kustomization.yaml +2026-07-02 04:40:10,443 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/external/gateway-inference-extension/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/external/gateway-inference-extension/kustomization.yaml +2026-07-02 04:40:10,443 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/external/gateway-inference-extension/gateway-inference-extension.yaml <- _output/staging/rhoai/operator/kserve/crd/external/gateway-inference-extension/gateway-inference-extension.yaml +2026-07-02 04:40:10,443 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/external/opendatahub-operator/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/external/opendatahub-operator/kustomization.yaml +2026-07-02 04:40:10,444 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/external/opendatahub-operator/datasciencecluster.opendatahub.io_datascienceclusters.yaml <- _output/staging/rhoai/operator/kserve/crd/external/opendatahub-operator/datasciencecluster.opendatahub.io_datascienceclusters.yaml +2026-07-02 04:40:10,444 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/external/opendatahub-operator/dscinitialization.opendatahub.io_dscinitializations.yaml <- _output/staging/rhoai/operator/kserve/crd/external/opendatahub-operator/dscinitialization.opendatahub.io_dscinitializations.yaml +2026-07-02 04:40:10,444 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/full/kustomization.yaml +2026-07-02 04:40:10,444 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml +2026-07-02 04:40:10,445 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml +2026-07-02 04:40:10,445 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml +2026-07-02 04:40:10,445 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferenceservices.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_inferenceservices.yaml +2026-07-02 04:40:10,446 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_llminferenceserviceconfigs.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_llminferenceserviceconfigs.yaml +2026-07-02 04:40:10,447 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_llminferenceservices.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_llminferenceservices.yaml +2026-07-02 04:40:10,447 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelcaches.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelcaches.yaml +2026-07-02 04:40:10,448 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml +2026-07-02 04:40:10,448 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelnodes.yaml +2026-07-02 04:40:10,448 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_servingruntimes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_servingruntimes.yaml +2026-07-02 04:40:10,448 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_trainedmodels.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_trainedmodels.yaml +2026-07-02 04:40:10,449 DEBUG Copying assets/optional/ai-model-serving/kserve/crd/patches/protocol.yaml <- _output/staging/rhoai/operator/kserve/crd/patches/protocol.yaml +2026-07-02 04:40:10,449 INFO Clearing directory assets/optional/ai-model-serving/kserve/configmap/ +2026-07-02 04:40:10,449 DEBUG Copying assets/optional/ai-model-serving/kserve/configmap/kustomization.yaml <- _output/staging/rhoai/operator/kserve/configmap/kustomization.yaml +2026-07-02 04:40:10,449 DEBUG Copying assets/optional/ai-model-serving/kserve/configmap/inferenceservice.yaml <- _output/staging/rhoai/operator/kserve/configmap/inferenceservice.yaml +2026-07-02 04:40:10,449 INFO Clearing directory assets/optional/ai-model-serving/kserve/rbac/ +2026-07-02 04:40:10,451 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_role_binding.yaml +2026-07-02 04:40:10,451 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_role.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_role.yaml +2026-07-02 04:40:10,451 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_service.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_service.yaml +2026-07-02 04:40:10,451 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/kustomization.yaml <- _output/staging/rhoai/operator/kserve/rbac/kustomization.yaml +2026-07-02 04:40:10,451 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/leader_election_role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/leader_election_role_binding.yaml +2026-07-02 04:40:10,452 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/leader_election_role.yaml <- _output/staging/rhoai/operator/kserve/rbac/leader_election_role.yaml +2026-07-02 04:40:10,452 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/role_binding.yaml +2026-07-02 04:40:10,452 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/role.yaml +2026-07-02 04:40:10,452 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/service_account.yaml +2026-07-02 04:40:10,452 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/role_binding.yaml +2026-07-02 04:40:10,453 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/role.yaml +2026-07-02 04:40:10,453 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/service_account.yaml +2026-07-02 04:40:10,453 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/localmodelnode/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodelnode/role_binding.yaml +2026-07-02 04:40:10,453 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/localmodelnode/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodelnode/role.yaml +2026-07-02 04:40:10,454 DEBUG Copying assets/optional/ai-model-serving/kserve/rbac/localmodelnode/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodelnode/service_account.yaml +2026-07-02 04:40:10,454 INFO Clearing directory assets/optional/ai-model-serving/kserve/manager/ +2026-07-02 04:40:10,454 DEBUG Copying assets/optional/ai-model-serving/kserve/manager/kustomization.yaml <- _output/staging/rhoai/operator/kserve/manager/kustomization.yaml +2026-07-02 04:40:10,454 DEBUG Copying assets/optional/ai-model-serving/kserve/manager/manager.yaml <- _output/staging/rhoai/operator/kserve/manager/manager.yaml +2026-07-02 04:40:10,455 DEBUG Copying assets/optional/ai-model-serving/kserve/manager/service.yaml <- _output/staging/rhoai/operator/kserve/manager/service.yaml +2026-07-02 04:40:10,455 INFO Clearing directory assets/optional/ai-model-serving/kserve/webhook/ +2026-07-02 04:40:10,455 DEBUG Copying assets/optional/ai-model-serving/kserve/webhook/kustomization.yaml <- _output/staging/rhoai/operator/kserve/webhook/kustomization.yaml +2026-07-02 04:40:10,455 DEBUG Copying assets/optional/ai-model-serving/kserve/webhook/manifests.yaml <- _output/staging/rhoai/operator/kserve/webhook/manifests.yaml +2026-07-02 04:40:10,455 DEBUG Copying assets/optional/ai-model-serving/kserve/webhook/service.yaml <- _output/staging/rhoai/operator/kserve/webhook/service.yaml +2026-07-02 04:40:10,456 INFO Clearing directory assets/optional/ai-model-serving/kserve/localmodels/ +2026-07-02 04:40:10,456 DEBUG Copying assets/optional/ai-model-serving/kserve/localmodels/kustomization.yaml <- _output/staging/rhoai/operator/kserve/localmodels/kustomization.yaml +2026-07-02 04:40:10,456 DEBUG Copying assets/optional/ai-model-serving/kserve/localmodels/manager.yaml <- _output/staging/rhoai/operator/kserve/localmodels/manager.yaml +2026-07-02 04:40:10,456 INFO Clearing directory assets/optional/ai-model-serving/kserve/localmodelnodes/ +2026-07-02 04:40:10,457 DEBUG Copying assets/optional/ai-model-serving/kserve/localmodelnodes/kustomization.yaml <- _output/staging/rhoai/operator/kserve/localmodelnodes/kustomization.yaml +2026-07-02 04:40:10,457 DEBUG Copying assets/optional/ai-model-serving/kserve/localmodelnodes/manager.yaml <- _output/staging/rhoai/operator/kserve/localmodelnodes/manager.yaml +2026-07-02 04:40:10,457 INFO Clearing directory assets/optional/ai-model-serving/kserve/llmisvc/ +2026-07-02 04:40:10,458 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-decode-template.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-decode-template.yaml +2026-07-02 04:40:10,458 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-decode-worker-data-parallel.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-decode-worker-data-parallel.yaml +2026-07-02 04:40:10,458 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-prefill-template.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-prefill-template.yaml +2026-07-02 04:40:10,458 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-prefill-worker-data-parallel.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-prefill-worker-data-parallel.yaml +2026-07-02 04:40:10,459 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-router-route.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-router-route.yaml +2026-07-02 04:40:10,459 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-scheduler.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-scheduler.yaml +2026-07-02 04:40:10,459 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-template.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-template.yaml +2026-07-02 04:40:10,459 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-worker-data-parallel.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-worker-data-parallel.yaml +2026-07-02 04:40:10,459 DEBUG Copying assets/optional/ai-model-serving/kserve/llmisvc/kustomization.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/kustomization.yaml +2026-07-02 04:40:10,460 INFO Clearing directory assets/optional/ai-model-serving/kserve/certmanager/ +2026-07-02 04:40:10,460 DEBUG Copying assets/optional/ai-model-serving/kserve/certmanager/certificate.yaml <- _output/staging/rhoai/operator/kserve/certmanager/certificate.yaml +2026-07-02 04:40:10,460 DEBUG Copying assets/optional/ai-model-serving/kserve/certmanager/kustomization.yaml <- _output/staging/rhoai/operator/kserve/certmanager/kustomization.yaml +2026-07-02 04:40:10,460 INFO Clearing directory assets/optional/ai-model-serving/kserve/monitoring/llmisvc/ +2026-07-02 04:40:10,461 DEBUG Copying assets/optional/ai-model-serving/kserve/monitoring/llmisvc/kustomization.yaml <- _output/staging/rhoai/operator/kserve/monitoring/llmisvc/kustomization.yaml +2026-07-02 04:40:10,461 DEBUG Copying assets/optional/ai-model-serving/kserve/monitoring/llmisvc/rbac.yaml <- _output/staging/rhoai/operator/kserve/monitoring/llmisvc/rbac.yaml +2026-07-02 04:40:10,461 DEBUG Copying assets/optional/ai-model-serving/kserve/monitoring/llmisvc/istio_gateway_monitor.yaml <- _output/staging/rhoai/operator/kserve/monitoring/llmisvc/istio_gateway_monitor.yaml +2026-07-02 04:40:10,461 INFO Clearing directory assets/optional/ai-model-serving/runtimes/ +2026-07-02 04:40:10,462 INFO Restoring assets/optional/ai-model-serving/runtimes/kustomization.yaml +2026-07-02 04:40:10,462 DEBUG Executing 'git restore assets/optional/ai-model-serving/runtimes/kustomization.yaml' +2026-07-02 04:40:10,506 WARNING Ignoring optional/ai-model-serving/runtimes/kustomization.x86_64.yaml because Generated during rebase +2026-07-02 04:40:10,507 DEBUG Copying assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/caikit-standalone-template.yaml +2026-07-02 04:40:10,507 DEBUG Copying assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/caikit-tgis-template.yaml +2026-07-02 04:40:10,507 DEBUG Copying assets/optional/ai-model-serving/runtimes/hf-detector.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/hf-detector-template.yaml +2026-07-02 04:40:10,507 DEBUG Copying assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/ovms-kserve-template.yaml +2026-07-02 04:40:10,507 DEBUG Copying assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-cuda-template.yaml +2026-07-02 04:40:10,508 DEBUG Copying assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-gaudi-template.yaml +2026-07-02 04:40:10,508 DEBUG Copying assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-rocm-template.yaml +Initializing release.json file +Dropping template containers from ServingRuntimes and changing them to ClusterServingRuntimes +Creating ClusterServingRuntimes images kustomization +No changes to assets/ or last_rebase_ai_model_serving.sh +Removing staging directory diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index ed9c3a72f8..225714fe11 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,166 @@ -- kubernetes image-arm64 cb701a76af41b535bbbc3db709ac5b0da52fb632 to a466682e3867da746be24d7d56c6641612721d6c +- api embedded-component 5346161d1bf2a4b45d998678f00e1e8d224acf7b to 6bba8bc85ccc7fef33c4d19aaba85e3683fd3bc9 + - cc6e909a 2026-06-29T11:21:29+01:00 Move pre-flight checks earlier to start of genGroup + - e9fc655c 2026-06-29T11:21:27+01:00 Update verify protobuf scripts + - cba640f1 2026-06-29T11:21:26+01:00 Enable codegen protobuf on legacy APIs + - f1e1d672 2026-06-29T11:21:25+01:00 Add the ability to skip protobuf generation for certain versions + - 85578e6e 2026-06-29T11:21:24+01:00 Add verification of generated protobuf files + - 10804f69 2026-06-29T11:18:37+01:00 Implement protobuf generator within codegen + - ce609dbc 2026-06-29T11:18:36+01:00 Add gogoproto to vendor + - 36b8e4d2 2026-06-29T11:18:35+01:00 Bootstrap initial go-to-protobuf generator in codegen + - 0b97f9b9 2026-06-26T09:06:58-07:00 AUTOSCALE-827: add KarpenterOperator feature gate + - e096b7be 2026-06-24T09:40:03-04:00 OCPBUGS-63219: Add protocol to AWS NLB parameters + - 8f87a41c 2026-06-24T08:01:53-04:00 Add MutableTopology feature gate for spec.controlPlaneTopology + - fd7d48b8 2026-06-23T12:34:23-03:00 chore: SPLAT-2588: enable feature on Hypershift + - 3d2c4233 2026-06-23T11:29:45+01:00 - Adding cabilities for crdcompatibilitychecker and capi CRs + - 5300823d 2026-06-22T17:33:15-03:00 fix(tools): use external topology for hypershift Sippy queries + - f74255e3 2026-06-22T17:33:12-03:00 fix(tools): display hypershift in HTML/markdown reports for external topology + - cc00868b 2026-06-22T17:33:12-03:00 test(tools): add unit tests for featuregate-test-analyzer + - 97133a45 2026-06-22T15:54:14-04:00 Promote VSphereMixedNodeEnv to GA + - c85beac3 2026-06-22T10:41:40-04:00 Add v1 type CRIOCredentialProviderConfig + - 6f5089fa 2026-06-22T13:57:57+05:30 Add API integration tests + - 09b9bcb8 2026-06-22T13:57:55+05:30 Add Secrets Store CSI driver configuration to ClusterCSIDriver API + - 1d2fb194 2026-06-16T09:39:23+02:00 STOR-2966: Promote ExternalSnapshotMetadata feature gate to TechPreviewNoUpgrade + - 3f52e05e 2026-06-09T15:44:21+02:00 Add SELinuxMountGAReadiness FG + +- cluster-ingress-operator embedded-component bf13f251347308b80b170582de455c59cb0510be to 6d4e06c4f11b2536386d14b701a766be34742adf + - d76f79cc 2026-06-26T00:38:57Z Revert "NE-2664: deploy haproxy as sidecar (#1439)" + - f322b5de 2026-06-24T15:02:18-04:00 Fix useOLM guard logic and and add remediation guidance + - a78ff4ec 2026-06-19T10:00:23-03:00 deploy haproxy as sidecar + - 398622a0 2026-06-18T17:50:52-04:00 OCPBUGS-90505: Guard subscriptionCache creation with OLM capability check + - 6f3c80ba 2026-06-18T17:50:45-04:00 OCPBUGS-90505: Guard OLM watches with capability check in gatewayclass controller + - 0421cc19 2026-06-15T22:29:43-04:00 OCPBUGS-86833: Detect orphaned OSSM subscription after noOLM migration + +- cluster-kube-apiserver-operator embedded-component e3c762513675e506be2be1e219f1ef621db18275 to 6ffdb079b3aa9249b101b58e6590a22c6cf5cb5f + - 020339b 2026-06-29T16:50:32+03:00 Bump library-go for sync + - 039a08d 2026-06-25T11:13:10+03:00 Wire health reporter + - 4dd7f19 2026-06-25T11:03:52+03:00 Bump library-go + - a1e06e7 2026-06-24T17:50:06+03:00 Update openshift dependencies + - cc13111 2026-06-22T15:06:38+02:00 NO-JIRA: add kms preflight to NP to allow egress + - a960532 2026-06-12T13:35:26+02:00 add openshift/kms parent to kms test suites + +- cluster-kube-controller-manager-operator embedded-component c35307f04313369c9ba4dcab3308506a3987065e to 8bef9812e7a3ec026397acd34633a7ecd479f357 + - c3f74d9 2026-06-26T15:00:24+02:00 Use %w for error wrapping consistently + +- cluster-network-operator embedded-component c376140ed1842c6a5f78cb74c55b4b49ba212041 to 7b341b420baeb655d65e551a1f04e3bcbe2631f1 + - c90d9fb 2026-06-24T14:14:20+02:00 Add CodeRabbit configuration for automated PR reviews + - 8db6228 2026-06-18T10:50:36-07:00 Watch Network and Infrastructure in proxyconfig controller + - b223b6c 2026-06-09T18:00:33+02:00 Update openshift/api and openshift/client-go to latest + - 050d838 2026-05-09T08:13:12-04:00 Add missing CNCC NetworkPolicies + - 39ffe54 2026-05-09T08:08:17-04:00 Add proper CVO annotations to CNO default-deny NP + +- cluster-policy-controller embedded-component bb429f5b2a7d77791110b06d8ec5c017183e3ab9 to 050c1ee6aeb0838daf75858fd853cca1e0098fa9 + - a03103a 2026-06-19T15:45:24+02:00 update OWNERS file + - 69f126c 2026-06-19T11:46:31+02:00 add serviceAccountToken volume type to psalabelsyncer + - aefcd82 2026-06-19T11:43:58+02:00 go mod vendor + - ab6e156 2026-06-19T11:42:00+02:00 bump openshift/api + +- csi-external-snapshotter embedded-component e695e2bd0b548afd0fce049d86d4af29dd34e574 to b5e4b73f9a761ff8a59f31b982a63e1cdbb76ed8 + - 9c6d440 2026-06-26T14:15:39+02:00 UPSTREAM: : disable verify-subtree check + - ae3f2e8 2026-06-26T14:13:11+02:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-csi-snapshot-controller.yml + - 30b4b2b 2026-06-25T14:54:26+02:00 UPSTREAM: : Add OpenShift files + +- kubernetes embedded-component d8d517e6bbe7cf7359026cac26bb96ea45e18806 to a466682e3867da746be24d7d56c6641612721d6c + - 410f58272 2026-06-16T23:18:18-06:00 UPSTREAM: : Add NodeSelectorAdjuster admission plugin for standalone clusters - 7ffb8b2ae 2026-06-15T13:17:06-04:00 UPSTREAM: : fix kubernetes/conformance to filter on [Conformance] label +- machine-config-operator embedded-component fb5bfe252ba774a014af1059223cea3d07ef14dd to f05e48737d9db0a62f45f6ef06fc7382a4333fed + - 6618f142 2026-06-30T06:18:16Z OCPEDGE-2473: feat: enabled graceful shutdown for TNF clusters (#6036) + - 1ccbd74e 2026-06-27T12:19:59+05:30 NO-ISSUE: Use DebugNodeWithChrootStd for FIPS check to separate stdout from stderr + - 3a9d76eb 2026-06-26T12:53:29-04:00 OCPBUGS-88333: Fix bootupd workaround in old nodes + - 46030024 2026-06-25T12:46:37+05:30 NO-ISSUE: Use /proc/sys/crypto/fips_enabled for FIPS check in tests + - 5676f30e 2026-06-24T08:28:02-05:00 Remove verbose ignition config logging from bootstrap MCS + - fb2491ab 2026-06-23T11:59:01-04:00 test: remove stub upgrade test + - 95e21734 2026-06-23T17:55:50+05:30 NO-ISSUE: Temporarily disable sandboxed-containers extension from tests + - ba2edec9 2026-06-22T15:40:19-04:00 upgrademonitor: skip no-op MCN SSA calls + - ea5455d8 2026-06-22T10:23:33-04:00 temporarily remove sandboxed-containers from extensions test + - 754cec07 2026-06-22T08:44:40+02:00 OCPBUGS-59958: Updated Unit Test, added extra getconfig check + - 9fac87e5 2026-06-19T20:40:14+05:30 Migrate OS layering tests from openshift-tests-private + - 449a1f79 2026-06-19T12:01:03+05:30 Revert "OKD-294: Migrate runtime from runc to crun on an upgrade for OKD" + - f617a2c5 2026-06-18T10:28:19-04:00 bootimage: add reset cluster bootimage capability + - fa12d23e 2026-06-18T10:28:19-04:00 bootimage: remove configmap version checks + - db282613 2026-06-18T10:28:19-04:00 bootimage: rename patchSkipped to reconcileSkipped + - 0ebbf630 2026-06-18T10:27:15-04:00 bootimage: make vsphere updates atomic + - a552644b 2026-06-17T17:42:55+02:00 NO-ISSUE: Remove dead code + - 51e1b0df 2026-06-17T12:41:32+02:00 OCPBUGS-59958: move cleanUpDuplicatedMC to after pool loop in syncNodeConfigHandler + - 50a50881 2026-06-09T13:29:35Z Block runc on RHEL 10 in bootstrap render path + - fd486c21 2026-06-09T13:29:35Z Block MachineConfig rendering when runc is configured on RHEL 10 pools + +- operator-framework-olm embedded-component 32225496430f8607ece581277f56e254fed708be to cea3be72ef5704256bd35ab88acfa9ab03edf6df + - a6faf7ea 2026-06-29T10:49:09-04:00 fix: warn-and-continue when cluster TLS profile lookup fails at startup (#3860) + - 6907f19c 2026-06-29T10:46:02-04:00 Revert "Merge pull request #1334 from redhat-chai-bot/revert-1330-1782684731" + - 4b0c882b 2026-06-28T22:12:12Z Revert "Merge pull request #1330 from openshift-bot/synchronize-upstream" + - 80043d4c 2026-06-25T00:05:29Z :seedling: Bump github.com/containerd/containerd from 1.7.32 to 1.7.33 (#3858) + - aef2567a 2026-06-25T00:04:48Z Upgrade hashstructure and mapstructure to v2 (#3854) + - 07fd0b98 2026-06-25T00:04:32Z :seedling: Bump github.com/prometheus/common from 0.68.1 to 0.69.0 (#3857) + - 20fa2f20 2026-06-25T00:04:17Z :seedling: Bump github.com/onsi/ginkgo/v2 from 2.31.0 to 2.32.0 (#3856) + - 546c08d1 2026-06-25T00:04:01Z Bump actions/checkout from 6 to 7 (#3855) + - 3a95edb6 2026-06-25T00:03:46Z Apply cluster TLS security profile to packageserver serving options (#3849) + - 83332273 2026-06-25T00:03:27Z :seedling: Bump the k8s-dependencies group across 1 directory with 8 updates (#3850) + +- route-controller-manager embedded-component e454c01fbe561cce9973f54b1ddbcdd35a9d18ff to 01ccbfb991fdbc559820a04c4932fc5ddf2339d0 + - d825fa2 2026-06-23T23:22:09-04:00 Update go.mod to match Go 1.26.3 builder images + - d809961 2026-06-06T09:48:07Z Updating ose-route-controller-manager-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7691ed4dc0b6585b358f9e73fb736ace9a48a286/images/ose-route-controller-manager.yml + +- service-ca-operator embedded-component 35cf51895f4dc77dca8a709e7635980753f87e17 to 6391e070d2ab026324b032a6fa5fc7d6be0d2cb5 + - e258072 2026-06-25T21:42:09+01:00 Update CONTRIBUTING.md to match updates to template + - 0ef0d32 2026-06-25T15:53:28+01:00 Merge in changes from PR#363 + - 5e8bcab 2026-06-24T21:16:29+01:00 Add AI SDLC context files + - 6b9cb8c 2026-06-24T12:03:49+02:00 feat: have CVO inject the centralized TLS configuration into the operator's config + +- oc image-amd64 74e525a6a4523a23a5db585c411943b0a0a338da to a7ad57244d4327c77d0fa190bb6d215d2d5faa86 + - fa71bfe5 2026-06-29T14:27:49+02:00 Add ARCHITECTURE.md, adopt shared CONTRIBUTING.md, slim README + - 15da98fa 2026-06-24T18:47:01+05:30 Assert expected tempDir in codesign extraction tests + - 2419b54b 2026-06-23T15:13:38+05:30 Catch exact '..' entry in archive containment check + - 9710f19c 2026-06-23T13:59:01+05:30 Fix zipslip in image archive unpack and refine codesign guard + - d7534960 2026-06-19T14:54:01+05:30 Fix tar slip path traversal in codesign archive extraction + +- csi-external-snapshotter image-amd64 e695e2bd0b548afd0fce049d86d4af29dd34e574 to b5e4b73f9a761ff8a59f31b982a63e1cdbb76ed8 + - 9c6d440 2026-06-26T14:15:39+02:00 UPSTREAM: : disable verify-subtree check + - ae3f2e8 2026-06-26T14:13:11+02:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-csi-snapshot-controller.yml + - 30b4b2b 2026-06-25T14:54:26+02:00 UPSTREAM: : Add OpenShift files + +- router image-amd64 3553702970b094986d91f218e3191487de46e476 to 92a1fe6420e7fa5cff3ac1e4234b866e8f742c9f + - 0e72c4d 2026-06-29T16:03:08-03:00 Add HAProxy standalone images for 2.8 and 3.2 + - 42ee1e6 2026-06-08T06:07:59Z Updating openshift-enterprise-haproxy-router-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/openshift-enterprise-haproxy-router.yml + +- ovn-kubernetes image-amd64 62baca4832f3aeb3fc7032d38619835c04208c95 to f0527039dfc4901637721e7cecfdb9d0ea1c9c38 + - 10d5782c 2026-06-16T20:56:43-07:00 Fix perma-failing security presubmit job + - 133ba1e4 2026-05-08T09:45:38+02:00 Promote EVPN E2Es from informing to blocking tests + +- kubernetes image-amd64 d8d517e6bbe7cf7359026cac26bb96ea45e18806 to a466682e3867da746be24d7d56c6641612721d6c + - 410f58272 2026-06-16T23:18:18-06:00 UPSTREAM: : Add NodeSelectorAdjuster admission plugin for standalone clusters + - 7ffb8b2ae 2026-06-15T13:17:06-04:00 UPSTREAM: : fix kubernetes/conformance to filter on [Conformance] label + +- service-ca-operator image-amd64 35cf51895f4dc77dca8a709e7635980753f87e17 to 6391e070d2ab026324b032a6fa5fc7d6be0d2cb5 + - e258072 2026-06-25T21:42:09+01:00 Update CONTRIBUTING.md to match updates to template + - 0ef0d32 2026-06-25T15:53:28+01:00 Merge in changes from PR#363 + - 5e8bcab 2026-06-24T21:16:29+01:00 Add AI SDLC context files + - 6b9cb8c 2026-06-24T12:03:49+02:00 feat: have CVO inject the centralized TLS configuration into the operator's config + +- oc image-arm64 74e525a6a4523a23a5db585c411943b0a0a338da to a7ad57244d4327c77d0fa190bb6d215d2d5faa86 + - fa71bfe5 2026-06-29T14:27:49+02:00 Add ARCHITECTURE.md, adopt shared CONTRIBUTING.md, slim README + - 15da98fa 2026-06-24T18:47:01+05:30 Assert expected tempDir in codesign extraction tests + - 2419b54b 2026-06-23T15:13:38+05:30 Catch exact '..' entry in archive containment check + - 9710f19c 2026-06-23T13:59:01+05:30 Fix zipslip in image archive unpack and refine codesign guard + - d7534960 2026-06-19T14:54:01+05:30 Fix tar slip path traversal in codesign archive extraction + +- csi-external-snapshotter image-arm64 e695e2bd0b548afd0fce049d86d4af29dd34e574 to b5e4b73f9a761ff8a59f31b982a63e1cdbb76ed8 + - 9c6d440 2026-06-26T14:15:39+02:00 UPSTREAM: : disable verify-subtree check + - ae3f2e8 2026-06-26T14:13:11+02:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-csi-snapshot-controller.yml + - 30b4b2b 2026-06-25T14:54:26+02:00 UPSTREAM: : Add OpenShift files + +- router image-arm64 3553702970b094986d91f218e3191487de46e476 to 92a1fe6420e7fa5cff3ac1e4234b866e8f742c9f + - 0e72c4d 2026-06-29T16:03:08-03:00 Add HAProxy standalone images for 2.8 and 3.2 + - 42ee1e6 2026-06-08T06:07:59Z Updating openshift-enterprise-haproxy-router-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/openshift-enterprise-haproxy-router.yml + +- ovn-kubernetes image-arm64 62baca4832f3aeb3fc7032d38619835c04208c95 to 6617c2a2ce4ab2e060e649672c91cf349d8500f7 + - 91d29f7b 2026-06-18T18:51:01+05:30 Dockerfile.base: Bump OVN to 26.03 + - 10d5782c 2026-06-16T20:56:43-07:00 Fix perma-failing security presubmit job + - 133ba1e4 2026-05-08T09:45:38+02:00 Promote EVPN E2Es from informing to blocking tests + +- service-ca-operator image-arm64 35cf51895f4dc77dca8a709e7635980753f87e17 to 6391e070d2ab026324b032a6fa5fc7d6be0d2cb5 + - e258072 2026-06-25T21:42:09+01:00 Update CONTRIBUTING.md to match updates to template + - 0ef0d32 2026-06-25T15:53:28+01:00 Merge in changes from PR#363 + - 5e8bcab 2026-06-24T21:16:29+01:00 Add AI SDLC context files + - 6b9cb8c 2026-06-24T12:03:49+02:00 feat: have CVO inject the centralized TLS configuration into the operator's config + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 8bc99ce5ca..fca884c802 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ -https://github.com/openshift/api embedded-component 5346161d1bf2a4b45d998678f00e1e8d224acf7b +https://github.com/openshift/api embedded-component 6bba8bc85ccc7fef33c4d19aaba85e3683fd3bc9 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component d7262f23f8c661ef6a215377b9571b615a1ae0b8 https://github.com/openshift/cluster-dns-operator embedded-component 8395f9054f235aec2cd5185019d201146c9827ed -https://github.com/openshift/cluster-ingress-operator embedded-component bf13f251347308b80b170582de455c59cb0510be -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e3c762513675e506be2be1e219f1ef621db18275 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c35307f04313369c9ba4dcab3308506a3987065e +https://github.com/openshift/cluster-ingress-operator embedded-component 6d4e06c4f11b2536386d14b701a766be34742adf +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 6ffdb079b3aa9249b101b58e6590a22c6cf5cb5f +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 8bef9812e7a3ec026397acd34633a7ecd479f357 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d43423b583269eea8236040424609c3f108ac9c4 -https://github.com/openshift/cluster-network-operator embedded-component c376140ed1842c6a5f78cb74c55b4b49ba212041 +https://github.com/openshift/cluster-network-operator embedded-component 7b341b420baeb655d65e551a1f04e3bcbe2631f1 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 34f95b07f4afbc47558e54e4fa2710fd692e615e -https://github.com/openshift/cluster-policy-controller embedded-component bb429f5b2a7d77791110b06d8ec5c017183e3ab9 -https://github.com/openshift/csi-external-snapshotter embedded-component e695e2bd0b548afd0fce049d86d4af29dd34e574 +https://github.com/openshift/cluster-policy-controller embedded-component 050c1ee6aeb0838daf75858fd853cca1e0098fa9 +https://github.com/openshift/csi-external-snapshotter embedded-component b5e4b73f9a761ff8a59f31b982a63e1cdbb76ed8 https://github.com/openshift/etcd embedded-component bf6c0094589afdf6c814a28c24f8f1bb5a577816 -https://github.com/openshift/kubernetes embedded-component d8d517e6bbe7cf7359026cac26bb96ea45e18806 +https://github.com/openshift/kubernetes embedded-component a466682e3867da746be24d7d56c6641612721d6c https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component fb5bfe252ba774a014af1059223cea3d07ef14dd +https://github.com/openshift/machine-config-operator embedded-component f05e48737d9db0a62f45f6ef06fc7382a4333fed https://github.com/openshift/openshift-controller-manager embedded-component 5631cf493b006cbc72a8600a7435813272d71940 -https://github.com/openshift/operator-framework-olm embedded-component 32225496430f8607ece581277f56e254fed708be -https://github.com/openshift/route-controller-manager embedded-component e454c01fbe561cce9973f54b1ddbcdd35a9d18ff -https://github.com/openshift/service-ca-operator embedded-component 35cf51895f4dc77dca8a709e7635980753f87e17 -https://github.com/openshift/oc image-amd64 74e525a6a4523a23a5db585c411943b0a0a338da +https://github.com/openshift/operator-framework-olm embedded-component cea3be72ef5704256bd35ab88acfa9ab03edf6df +https://github.com/openshift/route-controller-manager embedded-component 01ccbfb991fdbc559820a04c4932fc5ddf2339d0 +https://github.com/openshift/service-ca-operator embedded-component 6391e070d2ab026324b032a6fa5fc7d6be0d2cb5 +https://github.com/openshift/oc image-amd64 a7ad57244d4327c77d0fa190bb6d215d2d5faa86 https://github.com/openshift/coredns image-amd64 97f7cc327ab5df7d6da38137b7be338efa9a3551 -https://github.com/openshift/csi-external-snapshotter image-amd64 e695e2bd0b548afd0fce049d86d4af29dd34e574 -https://github.com/openshift/router image-amd64 3553702970b094986d91f218e3191487de46e476 +https://github.com/openshift/csi-external-snapshotter image-amd64 b5e4b73f9a761ff8a59f31b982a63e1cdbb76ed8 +https://github.com/openshift/router image-amd64 92a1fe6420e7fa5cff3ac1e4234b866e8f742c9f https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c59373240a7eae7a7a357dcb3 -https://github.com/openshift/ovn-kubernetes image-amd64 62baca4832f3aeb3fc7032d38619835c04208c95 -https://github.com/openshift/kubernetes image-amd64 d8d517e6bbe7cf7359026cac26bb96ea45e18806 -https://github.com/openshift/service-ca-operator image-amd64 35cf51895f4dc77dca8a709e7635980753f87e17 -https://github.com/openshift/oc image-arm64 74e525a6a4523a23a5db585c411943b0a0a338da +https://github.com/openshift/ovn-kubernetes image-amd64 f0527039dfc4901637721e7cecfdb9d0ea1c9c38 +https://github.com/openshift/kubernetes image-amd64 a466682e3867da746be24d7d56c6641612721d6c +https://github.com/openshift/service-ca-operator image-amd64 6391e070d2ab026324b032a6fa5fc7d6be0d2cb5 +https://github.com/openshift/oc image-arm64 a7ad57244d4327c77d0fa190bb6d215d2d5faa86 https://github.com/openshift/coredns image-arm64 97f7cc327ab5df7d6da38137b7be338efa9a3551 -https://github.com/openshift/csi-external-snapshotter image-arm64 e695e2bd0b548afd0fce049d86d4af29dd34e574 -https://github.com/openshift/router image-arm64 3553702970b094986d91f218e3191487de46e476 +https://github.com/openshift/csi-external-snapshotter image-arm64 b5e4b73f9a761ff8a59f31b982a63e1cdbb76ed8 +https://github.com/openshift/router image-arm64 92a1fe6420e7fa5cff3ac1e4234b866e8f742c9f https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3 -https://github.com/openshift/ovn-kubernetes image-arm64 62baca4832f3aeb3fc7032d38619835c04208c95 +https://github.com/openshift/ovn-kubernetes image-arm64 6617c2a2ce4ab2e060e649672c91cf349d8500f7 https://github.com/openshift/kubernetes image-arm64 a466682e3867da746be24d7d56c6641612721d6c -https://github.com/openshift/service-ca-operator image-arm64 35cf51895f4dc77dca8a709e7635980753f87e17 +https://github.com/openshift/service-ca-operator image-arm64 6391e070d2ab026324b032a6fa5fc7d6be0d2cb5 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 31f79188d8..9acfa29dd8 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-06-22-235733" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-06-26-004304" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-07-01-125918" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-07-02-035219"