From e5cb50f69e53b52d0c4c618699d78a273f2ad40e Mon Sep 17 00:00:00 2001 From: JunYang Date: Thu, 28 Jan 2021 16:50:43 +0800 Subject: [PATCH] Change log: fix broken page anchor url encodings Signed-off-by: JunYang --- CHANGELOG/CHANGELOG-1.17.md | 2 +- CHANGELOG/CHANGELOG-1.19.md | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG/CHANGELOG-1.17.md b/CHANGELOG/CHANGELOG-1.17.md index 5c9e116c0ea..0d975b1905b 100644 --- a/CHANGELOG/CHANGELOG-1.17.md +++ b/CHANGELOG/CHANGELOG-1.17.md @@ -1873,7 +1873,7 @@ Prior to 1.17 and for existing nodes created by `kubeadm init` where kubelet cli `http_requests_total, http_response_size_bytes` `http_response_size_bytes_sum` `http_response_size_bytes_count` - due to removal from the prometheus client library. Prometheus http request meta-metrics are now generated from [`promhttp.InstrumentMetricHandler`](https://godoc.org/github.com/prometheus/client_golang/prometheus/promhttp#InstrumentMetricHandler) instead. + due to removal from the prometheus client library. Prometheus http request meta-metrics are now generated from [`promhttp.InstrumentMetricHandler`](https://godoc.org/github.com/prometheus/client_golang/prometheus/promhttp#InstrumentMetricHandler) instead. - Following metrics from kube-controller-manager are now marked as with the ALPHA stability level: `storage_count_attachable_volumes_in_use` `attachdetach_controller_total_volumes` diff --git a/CHANGELOG/CHANGELOG-1.19.md b/CHANGELOG/CHANGELOG-1.19.md index 5b9e952093e..399a39497f0 100644 --- a/CHANGELOG/CHANGELOG-1.19.md +++ b/CHANGELOG/CHANGELOG-1.19.md @@ -3417,13 +3417,8 @@ filename | sha512 hash - name: shared-disk - provisioner: kubernetes.io/azure-disk - parameters: -<<<<<<< HEAD - skuname: Premium_LRS # Currently only available with premium SSDs. - cachingMode: None # ReadOnly host caching is not available for premium SSDs with maxShares>1 -======= - - skuname: Premium_LRS #Currently only available with premium SSDs. - - cachingMode: None #ReadOnly host caching is not available for premium SSDs with maxShares>1 ->>>>>>> 74bb122e0a2... Change log:Fix hyperlink of description [kube-controller-manager-kube-scheduler-and-cloud-controller-manager] maxShares: 2 ([#89328](https://github.com/kubernetes/kubernetes/pull/89328), [@andyzhangx](https://github.com/andyzhangx)) [SIG Cloud Provider and Storage] - Kube-apiserver, kube-scheduler and kube-controller manager now use SO_REUSEPORT socket option when listening on address defined by --bind-address and --secure-port flags, when running on Unix systems (Windows is NOT supported). This allows to run multiple instances of those processes on a single host with the same configuration, which allows to update/restart them in a graceful way, without causing downtime. ([#88893](https://github.com/kubernetes/kubernetes/pull/88893), [@invidian](https://github.com/invidian)) [SIG API Machinery, Scheduling and Testing] - Kubeadm: The ClusterStatus struct present in the kubeadm-config ConfigMap is deprecated and will be removed on a future version. It is going to be maintained by kubeadm until it gets removed. The same information can be found on `etcd` and `kube-apiserver` pod annotations, `kubeadm.kubernetes.io/etcd.advertise-client-urls` and `kubeadm.kubernetes.io/kube-apiserver.advertise-address.endpoint` respectively. ([#87656](https://github.com/kubernetes/kubernetes/pull/87656), [@ereslibre](https://github.com/ereslibre)) [SIG Cluster Lifecycle]