Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/microshift

go 1.20
go 1.21

require (
github.com/apparentlymart/go-cidr v1.1.0
Expand All @@ -10,7 +10,7 @@ require (
github.com/openshift/api v0.0.0-20231218131639-7a5aa77cc72d
github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c
github.com/openshift/client-go v0.0.0-20231218155125-ff7d9f9bf415
github.com/openshift/cluster-policy-controller v0.0.0-20240105091254-efafeb428cb5
github.com/openshift/cluster-policy-controller efafeb428cb5fb95eb997873dc0d7c9d306df8f1
github.com/openshift/library-go v0.0.0-20231218143352-99cedb2a141c
github.com/openshift/route-controller-manager v0.0.0-20240105122523-95aa561e9387
github.com/pkg/errors v0.9.1 // indirect
Expand Down
209 changes: 209 additions & 0 deletions rebase_sh.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
# Rebasing to registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927
# Fetching release info for registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 (amd64)
# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927 (arm64)
# Extracting registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 manifest content
# Cloning registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 component repos
Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-csi-snapshot-controller-operator/.git/
HEAD is now at cc14f55 Merge pull request #187 from jsafrane/fix-lease-origin-master

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/
HEAD is now at 75c5dc1 Merge pull request #397 from openshift-bot/art-consistency-openshift-4.16-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 9c62f2b Merge pull request #1012 from candita/NE-1490-Update-to-go1.20

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/
HEAD is now at 31380bd Merge pull request #1584 from deads2k/more-cert-ownership

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/
HEAD is now at fc039eb Merge pull request #786 from ingvagabund/sync-library-go

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/
HEAD is now at d0d89c8 Merge pull request #530 from ingvagabund/readme-me-dump-node-cache

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/
HEAD is now at 2eed7cf Merge pull request #2191 from yuvalk/wip-enable-nsipsec

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/
HEAD is now at 83d2ca9 Merge pull request #320 from ardaguclu/ocpbugs-24190

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/
HEAD is now at efafeb4 Merge pull request #145 from ingvagabund/snyk

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/csi-external-snapshotter/.git/
HEAD is now at 1e876f9 Merge pull request #137 from openshift-bot/art-consistency-openshift-4.16-csi-snapshot-validation-webhook

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/
HEAD is now at 66af0e5d Merge pull request #237 from Elbehery/rebase-etcd-3.5.11-openshift-4.16

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/
HEAD is now at f629574cc Merge pull request #1845 from soltysh/golang_1.21

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes-kube-storage-version-migrator/.git/
HEAD is now at 2646eac Merge pull request #202 from openshift-bot/art-consistency-openshift-4.16-ose-kube-storage-version-migrator

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/
HEAD is now at e86fa920 Merge pull request #4126 from JoelSpeed/nodeenv-typo

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/
HEAD is now at 2a28a78 Merge pull request #280 from coreydaley/2023-11-15-rekor

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/operator-framework-olm/.git/
HEAD is now at e30565fc Merge pull request #659 from tmshort/synchonize-upstream

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/
HEAD is now at 95aa561 Merge pull request #37 from ingvagabund/snyk

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/
HEAD is now at 4d3d966 Merge pull request #225 from dinhxuanvu/cert-description

# Cloning registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 image repos
Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/
HEAD is now at e3734ee4 Merge pull request #1653 from flavianmissi/WRKLDS-950-inspect

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/
HEAD is now at b6a657d Merge pull request #107 from openshift-bot/art-consistency-openshift-4.16-coredns

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-snapshotter/.git/
HEAD is now at 1e876f9 Merge pull request #137 from openshift-bot/art-consistency-openshift-4.16-csi-snapshot-validation-webhook



Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/
HEAD is now at fcead81 Merge pull request #550 from openshift-bot/art-consistency-openshift-4.16-ose-haproxy-router-base

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/
HEAD is now at e8e8c84 Merge pull request #80 from ibihim/CVE-2023-44487-trimming-http2

openssl 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 be6c5c5 Merge pull request #1979 from openshift-bot/art-consistency-openshift-4.16-ovn-kubernetes-microshift

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/
HEAD is now at f629574cc Merge pull request #1845 from soltysh/golang_1.21

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/
HEAD is now at 4d3d966 Merge pull request #225 from dinhxuanvu/cert-description

topolvm_csi not from release payload, skipping

topolvm_csi_livenessprobe not from release payload, skipping

topolvm_csi_provisioner not from release payload, skipping

topolvm_csi_registrar not from release payload, skipping

topolvm_csi_resizer not from release payload, skipping

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/
HEAD is now at f5542cb4 Merge pull request #1650 from deads2k/release-info

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/
HEAD is now at b6a657d Merge pull request #107 from openshift-bot/art-consistency-openshift-4.16-coredns

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-snapshotter/.git/
HEAD is now at 1e876f9 Merge pull request #137 from openshift-bot/art-consistency-openshift-4.16-csi-snapshot-validation-webhook



Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/
HEAD is now at fcead81 Merge pull request #550 from openshift-bot/art-consistency-openshift-4.16-ose-haproxy-router-base

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/
HEAD is now at e8e8c84 Merge pull request #80 from ibihim/CVE-2023-44487-trimming-http2

openssl 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 be6c5c5 Merge pull request #1979 from openshift-bot/art-consistency-openshift-4.16-ovn-kubernetes-microshift

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/
HEAD is now at 913d16a5d Merge pull request #1849 from soltysh/fix_skips

Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/
HEAD is now at 4d3d966 Merge pull request #225 from dinhxuanvu/cert-description

topolvm_csi not from release payload, skipping

topolvm_csi_livenessprobe not from release payload, skipping

topolvm_csi_provisioner not from release payload, skipping

topolvm_csi_registrar not from release payload, skipping

topolvm_csi_resizer not from release payload, skipping

Warning: env var PULL_BASE_REF not found or empty, falling back to local active branch.
error: branch 'rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15' not found.
Switched to a new branch 'rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15'
## Updating last_rebase.sh
## Committing changes to last_rebase.sh
[rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15 d9eb8f936] 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-ingress-operator embedded-component no change

cluster-kube-controller-manager-operator embedded-component no change

cluster-openshift-controller-manager-operator embedded-component no change

cluster-policy-controller embedded-component no change

csi-external-snapshotter 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

route-controller-manager embedded-component no change

service-ca-operator embedded-component no change

coredns image-amd64 no change

csi-external-snapshotter image-amd64 no change

csi-external-snapshotter image-amd64 no change

csi-external-snapshotter image-amd64 no change

router image-amd64 no change

kube-rbac-proxy image-amd64 no change

ovn-kubernetes image-amd64 no change

service-ca-operator image-amd64 no change

oc image-arm64 no change

coredns image-arm64 no change

csi-external-snapshotter image-arm64 no change

csi-external-snapshotter image-arm64 no change

csi-external-snapshotter image-arm64 no change

router image-arm64 no change

kube-rbac-proxy image-arm64 no change

ovn-kubernetes image-arm64 no change

kubernetes image-arm64 no change

service-ca-operator image-arm64 no change

## Committing changes to changelog
[rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15 91e9857c8] update changelog
2 files changed, 75 insertions(+), 37 deletions(-)
# Updating microshift/go.mod
go mod edit -require github.com/openshift/cluster-policy-controller@efafeb428cb5fb95eb997873dc0d7c9d306df8f1
go: go.mod file indicates go 1.21, but maximum version supported by tidy is 1.20
Loading