Skip to content

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-01-21-154905_amd64-2024-01-21_arm64-2024-01-15 #2917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
microshift-rebase-script wants to merge 9 commits into from
Closed

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-01-21-154905_amd64-2024-01-21_arm64-2024-01-15 #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b3aca20
update last_rebase.sh
Jan 23, 2024
2eac5a7
update changelog
Jan 23, 2024
8ca6fcd
update microshift/go.mod
Jan 23, 2024
3a260dc
update microshift/vendor
Jan 23, 2024
fc7dfd7
update etcd/go.mod
Jan 23, 2024
e9d3c56
update etcd/vendor
Jan 23, 2024
d6f8aa0
update component images
Jan 23, 2024
00069de
update manifests
Jan 23, 2024
7b1b10b
update buildfiles
Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=29
KUBE_GIT_VERSION=v1.29.0
KUBE_GIT_COMMIT=913d16a5d9fb76dfb617551d46b8c361a7128d3f
KUBE_GIT_COMMIT=f629574ccc853fb3bdcf028dbee42352d12c2fa9
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.16.0-0.nightly-2024-01-15-064322
OCP_VERSION := 4.16.0-0.nightly-2024-01-21-154905
27 changes: 18 additions & 9 deletions assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d9925408e0ace8766ae438c804f23a2d467b23dc36850a64b4a48a3d3b4c048b
digest: sha256:977327fda7c7695208888ca82943b7bf1b5ac6d1ae47fca96456d56f21e3d1e8
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b232158b025aa08bda263392f52ff04de0b590fbbb31fd136243309d0f12f001
digest: sha256:49ce0131a72c016e9445e8ce3e1e4d7a7d247715cc0e5113778440518d46c197
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:99e0960a5735a9e7947df7e2a7bc7a54c0ee169a7839ae236ede01bf8f274fb4
digest: sha256:2c719ad4eaf5f4ee83538a49e8ab0c30b103669e45075ad36415b1d96f0c1e31

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b232158b025aa08bda263392f52ff04de0b590fbbb31fd136243309d0f12f001
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ce0131a72c016e9445e8ce3e1e4d7a7d247715cc0e5113778440518d46c197
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9925408e0ace8766ae438c804f23a2d467b23dc36850a64b4a48a3d3b4c048b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:977327fda7c7695208888ca82943b7bf1b5ac6d1ae47fca96456d56f21e3d1e8
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-01-15-064322"
"base": "4.16.0-0.nightly-2024-01-21-154905"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9925408e0ace8766ae438c804f23a2d467b23dc36850a64b4a48a3d3b4c048b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b232158b025aa08bda263392f52ff04de0b590fbbb31fd136243309d0f12f001",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99e0960a5735a9e7947df7e2a7bc7a54c0ee169a7839ae236ede01bf8f274fb4"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:977327fda7c7695208888ca82943b7bf1b5ac6d1ae47fca96456d56f21e3d1e8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ce0131a72c016e9445e8ce3e1e4d7a7d247715cc0e5113778440518d46c197",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c719ad4eaf5f4ee83538a49e8ab0c30b103669e45075ad36415b1d96f0c1e31"
}
}
10 changes: 5 additions & 5 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-01-15-064322"
"base": "4.16.0-0.nightly-2024-01-21-154905"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a64d832bcde9df5e4304a74f0092863195c8034728978b25779c5cbf2faf474",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2cd382c1ccc8edfd3c3a6ff7ca53adba06cb23364099ef5e4a897b4140f9e7ac",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4ce7746dad80ba7b47c6f5c7469d74fe5cab5f11ef56d8f4b3b70da3a47a889",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e6ce90cff3f4c99818d3219403980b164a4823ef570111c2f7afd4c336491c6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99e0960a5735a9e7947df7e2a7bc7a54c0ee169a7839ae236ede01bf8f274fb4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c719ad4eaf5f4ee83538a49e8ab0c30b103669e45075ad36415b1d96f0c1e31",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c07e860448ca5fb0401fd8e556419055297991fec79362d3bbcb3ddedce77b4",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:396b1e84eab727a71805eb1d50054d1957bacb57f16691e6ca69552893ea491d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1b7337b188924c0c77ab64dc005b376934e43f4e8474d710e7805917158388d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22484c12834a34f5421b772a24696a44ac1dbfa22102bf29dce00a38068d0b9a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80591b390106c5503bc1c4328a6a086d13b746a7fc0b65d81964f1aefba0b292",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",
Expand Down
64 changes: 33 additions & 31 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/openshift/microshift/etcd

go 1.20
go 1.21

toolchain go1.21.3

require github.com/openshift/microshift v0.0.0

Expand Down Expand Up @@ -146,35 +148,35 @@ replace (
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240105153547-66af0e5d532b // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240105153547-66af0e5d532b // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240105153547-66af0e5d532b // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240111201904-913d16a5d9fb // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240111201904-913d16a5d9fb // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240116144113-f629574ccc85 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240116144113-f629574ccc85 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
)

replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240111201904-913d16a5d9fb // staging kubernetes
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240116144113-f629574ccc85 // staging kubernetes
Loading