github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix etcd repository path to prevent redirects.

Browse Source 
Signed-off-by: James Blair <mail@jamesblair.net>
This commit is contained in:
James Blair
2023-11-02 09:31:37 +13:00
parent 162599da69
commit b6c1f8ef08
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/etcd-version-monitor/etcd-version-monitor.go
View File

@@ -61,7 +61,7 @@ var (
customMetricRegistry = metrics.NewKubeRegistry() customMetricRegistry = metrics.NewKubeRegistry()
// Custom etcd version metric since etcd 3.2- does not export one. // Custom etcd version metric since etcd 3.2- does not export one.
// This will be replaced by https://github.com/coreos/etcd/pull/8960 in etcd 3.3. // This will be replaced by https://github.com/etcd-io/etcd/pull/8960 in etcd 3.3.
etcdVersion = metrics.NewGaugeVec( etcdVersion = metrics.NewGaugeVec(
&metrics.GaugeOpts{ &metrics.GaugeOpts{
Namespace: namespace, Namespace: namespace,

6
cluster/images/etcd/Makefile
View File

@@ -134,7 +134,7 @@ ifeq ($(ARCH),amd64)
ifeq ($(OS),windows) ifeq ($(OS),windows)
for version in $(BUNDLED_ETCD_VERSIONS); do \ for version in $(BUNDLED_ETCD_VERSIONS); do \
etcd_release_tmp_dir=$(shell mktemp -d); \ etcd_release_tmp_dir=$(shell mktemp -d); \
curl -sSL --retry 5 https://github.com/coreos/etcd/releases/download/v$$version/etcd-v$$version-windows-amd64.zip -o etcd-v$$version-windows-amd64.zip; \ curl -sSL --retry 5 https://github.com/etcd-io/etcd/releases/download/v$$version/etcd-v$$version-windows-amd64.zip -o etcd-v$$version-windows-amd64.zip; \
unzip -q -d $$etcd_release_tmp_dir etcd-v$$version-windows-amd64.zip; \ unzip -q -d $$etcd_release_tmp_dir etcd-v$$version-windows-amd64.zip; \
rm etcd-v$$version-windows-amd64.zip; \ rm etcd-v$$version-windows-amd64.zip; \
$(BIN_INSTALL) $$etcd_release_tmp_dir/etcd-v$$version-windows-amd64/etcd.exe $$etcd_release_tmp_dir/etcd-v$$version-windows-amd64/etcdctl.exe $(TEMP_DIR)/; \ $(BIN_INSTALL) $$etcd_release_tmp_dir/etcd-v$$version-windows-amd64/etcd.exe $$etcd_release_tmp_dir/etcd-v$$version-windows-amd64/etcdctl.exe $(TEMP_DIR)/; \
@@ -144,7 +144,7 @@ ifeq ($(OS),windows)
else else
for version in $(BUNDLED_ETCD_VERSIONS); do \ for version in $(BUNDLED_ETCD_VERSIONS); do \
etcd_release_tmp_dir=$(shell mktemp -d); \ etcd_release_tmp_dir=$(shell mktemp -d); \
curl -sSL --retry 5 https://github.com/coreos/etcd/releases/download/v$$version/etcd-v$$version-linux-amd64.tar.gz | tar -xz -C $$etcd_release_tmp_dir --strip-components=1; \ curl -sSL --retry 5 https://github.com/etcd-io/etcd/releases/download/v$$version/etcd-v$$version-linux-amd64.tar.gz | tar -xz -C $$etcd_release_tmp_dir --strip-components=1; \
$(BIN_INSTALL) $$etcd_release_tmp_dir/etcd $$etcd_release_tmp_dir/etcdctl $(TEMP_DIR)/; \ $(BIN_INSTALL) $$etcd_release_tmp_dir/etcd $$etcd_release_tmp_dir/etcdctl $(TEMP_DIR)/; \
$(BIN_INSTALL) $(TEMP_DIR)/etcd $(TEMP_DIR)/etcd-$$version; \ $(BIN_INSTALL) $(TEMP_DIR)/etcd $(TEMP_DIR)/etcd-$$version; \
$(BIN_INSTALL) $(TEMP_DIR)/etcdctl $(TEMP_DIR)/etcdctl-$$version; \ $(BIN_INSTALL) $(TEMP_DIR)/etcdctl $(TEMP_DIR)/etcdctl-$$version; \
@@ -168,7 +168,7 @@ else
etcd_build_dir="/go/src/go.etcd.io/etcd"; \ etcd_build_dir="/go/src/go.etcd.io/etcd"; \
fi; \ fi; \
docker run --rm --interactive -v $${etcd_release_tmp_dir}:/etcdbin golang:$(GOLANG_VERSION)$(DOCKER_VOL_OPTS) /bin/bash -c \ docker run --rm --interactive -v $${etcd_release_tmp_dir}:/etcdbin golang:$(GOLANG_VERSION)$(DOCKER_VOL_OPTS) /bin/bash -c \
"git clone https://github.com/coreos/etcd $$etcd_build_dir \ "git clone https://github.com/etcd-io/etcd $$etcd_build_dir \
&& cd $$etcd_build_dir \ && cd $$etcd_build_dir \
&& git checkout v$${version} \ && git checkout v$${version} \
&& $(arch_prefix) GOARCH=$(ARCH) ./build.sh \ && $(arch_prefix) GOARCH=$(ARCH) ./build.sh \

2
cmd/kubeadm/app/phases/certs/certlist.go
View File

@@ -352,7 +352,7 @@ func KubeadmCertEtcdServer() *KubeadmCert {
config: pkiutil.CertConfig{ config: pkiutil.CertConfig{
Config: certutil.Config{ Config: certutil.Config{
// TODO: etcd 3.2 introduced an undocumented requirement for ClientAuth usage on the // TODO: etcd 3.2 introduced an undocumented requirement for ClientAuth usage on the
// server cert: https://github.com/coreos/etcd/issues/9785#issuecomment-396715692 // server cert: https://github.com/etcd-io/etcd/issues/9785#issuecomment-396715692
// Once the upstream issue is resolved, this should be returned to only allowing // Once the upstream issue is resolved, this should be returned to only allowing
// ServerAuth usage. // ServerAuth usage.
Usages: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth}, Usages: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},

2
hack/lib/etcd.sh
View File

@@ -168,7 +168,7 @@ kube::etcd::install() {
ln -fns "etcd-v${ETCD_VERSION}-${os}-${arch}" etcd ln -fns "etcd-v${ETCD_VERSION}-${os}-${arch}" etcd
rm "${download_file}" rm "${download_file}"
elif [[ ${os} == "linux" ]]; then elif [[ ${os} == "linux" ]]; then
url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-${os}-${arch}.tar.gz" url="https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-${os}-${arch}.tar.gz"
download_file="etcd-v${ETCD_VERSION}-${os}-${arch}.tar.gz" download_file="etcd-v${ETCD_VERSION}-${os}-${arch}.tar.gz"
kube::util::download_file "${url}" "${download_file}" kube::util::download_file "${url}" "${download_file}"
tar xzf "${download_file}" tar xzf "${download_file}"

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/testing/testingcert/certificates.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package testingcert package testingcert
// You can use cfssl tool to generate certificates, please refer // You can use cfssl tool to generate certificates, please refer
// https://github.com/coreos/etcd/tree/master/hack/tls-setup for more details. // https://github.com/etcd-io/etcd/tree/main/hack/tls-setup for more details.
// //
// ca-config.json: // ca-config.json:
// //