Skip to content

Commit

Permalink
rebase-4.13.0-0.nightly-2023-02-15-202607_amd64-2023-02-15_arm64-2023…
Browse files Browse the repository at this point in the history
…-02-15 (openshift#1380)

* update last_rebase.sh

* update changelog

* update microshift/go.mod

* update microshift/vendor

* update etcd/go.mod

* update etcd/vendor

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot authored Feb 16, 2023
1 parent 921d668 commit 7dd54a8
Show file tree
Hide file tree
Showing 31 changed files with 1,109 additions and 462 deletions.
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=26
KUBE_GIT_VERSION=v1.26.0
KUBE_GIT_COMMIT=9eb81c20e0fde9d068ed83e58c8fc870412958a9
KUBE_GIT_COMMIT=c7296782f65144a9aed5b18bfb880fd4f9b9333e
KUBE_GIT_TREE_STATE=clean
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,38 @@ metadata:
name: topolvm-csi-provisioner
namespace: openshift-storage
rules:
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- watch
- list
- delete
- update
- create
- apiGroups:
- storage.k8s.io
resources:
- csistoragecapacities
verbs:
- get
- list
- watch
- create
- update
- patch
- delete
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- apiGroups:
- apps
resources:
- replicasets
verbs:
- get
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- watch
- list
- delete
- update
- create
- apiGroups:
- storage.k8s.io
resources:
- csistoragecapacities
verbs:
- get
- list
- watch
- create
- update
- patch
- delete
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- apiGroups:
- apps
resources:
- replicasets
verbs:
- get
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ roleRef:
kind: Role
name: topolvm-csi-provisioner
subjects:
- kind: ServiceAccount
name: topolvm-controller
namespace: openshift-storage
- kind: ServiceAccount
name: topolvm-controller
namespace: openshift-storage
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ metadata:
name: topolvm-csi-resizer
namespace: openshift-storage
rules:
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- watch
- list
- delete
- update
- create
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- watch
- list
- delete
- update
- create
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ roleRef:
kind: Role
name: topolvm-csi-resizer
subjects:
- kind: ServiceAccount
name: topolvm-controller
namespace: openshift-storage
- kind: ServiceAccount
name: topolvm-controller
namespace: openshift-storage
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ metadata:
name: topolvm-metrics
namespace: openshift-storage
rules:
- apiGroups:
- ""
resources:
- services
- endpoints
- pods
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- services
- endpoints
- pods
verbs:
- get
- list
- watch
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ roleRef:
kind: Role
name: topolvm-metrics
subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: openshift-monitoring
- kind: ServiceAccount
name: prometheus-k8s
namespace: openshift-monitoring
8 changes: 4 additions & 4 deletions assets/components/lvms/topolvm-node-metrics_v1_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ metadata:
namespace: openshift-storage
spec:
ports:
- name: topolvm-metrics
port: 8080
protocol: TCP
targetPort: 8080
- name: topolvm-metrics
port: 8080
protocol: TCP
targetPort: 8080
selector:
app.kubernetes.io/component: topolvm-node
status:
Expand Down
10 changes: 5 additions & 5 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-02-08-182807"
"base": "4.13.0-0.nightly-arm64-2023-02-15-143600"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3f2aeab14f3819746aed14b508d78813a31be3f0fd1a4df5f1856c136509ebf",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07beaae8b400588948e1ff17240ea33a18a90fdc57aa39ad44f7aa25062c35e3",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fff092c492974cc75631187f955e29c019f8ace77e96a4607646bd9c6ccb0ea",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b724ceae9beb0c03742ae176a8e99d1c5c54ab8a3c74e96a5638ef4246269703",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d591fd301c4af55e94e7ac63871c19feb8374428cc73607028fb08055626e2d1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16ba7ebb0d6129fe158bd66da6255ae77c0fa28c7293673da696224cf1728597",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc719b31695a0cef47943d4b6eb56c93e97b2d6dbb251a7f2cefbe34da802c3d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70768854bc132331a91fa03502b4d359ae367fd8ed70924869c3fa63a789cbf5",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cd2cefb62b12a0b630c49ce109307abeb9ac9e7e7f701a6aa7e494e695bef05",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fec9d55f90d23435514e8edb03521096e2b3f6e01f7b55c45a27c0835d5afe66",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c0ca408a898e6acbc649a0473b1ea83aa7dc5fed305a3562100734243a0c9e8",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
Expand Down
10 changes: 5 additions & 5 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-02-07-064924"
"base": "4.13.0-0.nightly-2023-02-15-202607"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23a6b4c13b2610e9bed8205d59acea8a30e8503948633d7a02cc6a45e431b7d3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31b8a600e8388e9e87197639e73a49da0f06f75fe67e702c8681ac83538919ad",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9360cc00adb3b01047db64238d287fe9ae24620c93ca5d7e477dd8b98b8584a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3da42cc691d4d4fd293862a3036cd58a57001154468cd0b0a8a6e22aa9e5b7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ed079be59e5686a18e2a86e3f0e093a63f2ba0493c62e651e742130200bf887",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec61024e2c37e5aba93593220b12ba91a3ba4f547b2562a36539ff1d9df74a23",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e21569ba6b2da124a92e516e50982d42c0942007dbe217570ee84ffcbca0cef0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e7bbc5e71123aaa1c0f30197d61921306833eb6149ad874e41e09e76a50f451",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3cc4db7f818219625d529fceebe60d90a1c9f535a9feb066aefeda8a7a43340",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:465a4cd0191288d4e60c2c2ecfa46b87870a32f2c82c94e48567ecdb0ab3e197",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c14f0342eebce36041f0904e2a4bcccd933d51c036d9319caeb19e656cf0a350",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
Expand Down
58 changes: 29 additions & 29 deletions etcd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -145,33 +145,33 @@ replace (
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230125165349-13c18c444a8c // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230203160803-9eb81c20e0fd // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230203160803-9eb81c20e0fd // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230203160803-9eb81c20e0fd // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230213202407-c7296782f651 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230213202407-c7296782f651 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230213202407-c7296782f651 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230213202407-c7296782f651 // staging kubernetes
)
Loading

0 comments on commit 7dd54a8

Please sign in to comment.