Skip to content

Commit

Permalink
Fixed etcd v3.4.10 error etcd-io/etcd#11798 [lwpm] [sync git]
Browse files Browse the repository at this point in the history
  • Loading branch information
khs1994 committed Jul 22, 2020
1 parent 8b5f346 commit b8b9aec
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 4 deletions.
5 changes: 4 additions & 1 deletion dockerfile/sync/docker-image-sync.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,20 @@
"dest": "flannel:v0.11.0",
"platforms": [
{
"source": "quay.io/coreos/flannel:v0.11.0-amd64"
"source": "quay.io/coreos/flannel:v0.11.0-amd64",
"dest": "flannel:v0.11.0-amd64"
},
{
"os": "linux",
"architecture": "arm64",
"variant": "v8",
"source": "quay.io/coreos/flannel:v0.11.0-arm64",
"dest": "flannel:v0.11.0-arm64"
},
{
"os": "linux",
"architecture": "arm",
"variant": "v7",
"dest": "flannel:v0.11.0-arm",
"registry": "quay.io",
"image": "coreos/flannel",
Expand Down
2 changes: 2 additions & 0 deletions kubernetes/.github/workflows/setup-k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,11 @@ jobs:

sleep 30

sudo journalctl -u etcd
sudo journalctl -u kube-apiserver
sudo journalctl -u kube-controller-manager
sudo journalctl -u kube-scheduler

sudo journalctl -u kube-proxy
sudo journalctl -u kubelet
sudo journalctl -u kube-containerd || true
Expand Down
4 changes: 3 additions & 1 deletion kubernetes/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ before_script:

- sleep 10
- sudo systemctl cat kubelet
- sudo systemctl start kubelet
- sudo systemctl start kubelet || sudo journalctl -u kubelet

- sleep 10
# - sudo systemctl status etcd
Expand All @@ -170,9 +170,11 @@ before_script:

- sleep 30

- sudo journalctl -u etcd
- sudo journalctl -u kube-apiserver
- sudo journalctl -u kube-controller-manager
- sudo journalctl -u kube-scheduler

- sudo journalctl -u kube-proxy
- sudo journalctl -u kubelet
- sudo journalctl -u kube-containerd || true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ systemd:
Environment="K8S_ROOT=${K8S_ROOT}"

ExecStartPre=-/usr/bin/mkdir --parents /opt/k8s/var/lib/etcd
ExecStartPre=-/usr/bin/env chmod 700 /opt/k8s/var/lib/etcd

ExecStartPre=-podman container rm etcd
ExecStart= podman run --name etcd --network host --privileged \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ systemd:
Environment="K8S_ROOT=${K8S_ROOT}"

ExecStartPre=-/usr/bin/mkdir --parents /opt/k8s/var/lib/etcd
ExecStartPre=-/usr/bin/env chmod 700 /opt/k8s/var/lib/etcd

ExecStartPre=-podman container rm etcd
ExecStartPre=-/bin/podman pull quay.io/coreos/etcd:v${ETCD_VERSION}
Expand Down
1 change: 1 addition & 0 deletions kubernetes/systemd/etcd.service
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Environment="K8S_ROOT=/opt/k8s"
Environment="K8S_ETCD_HOST=192.168.199.100"

ExecStartPre=-/usr/bin/mkdir --parents /opt/k8s/var/lib/etcd
ExecStartPre=-/usr/bin/env chmod 700 /opt/k8s/var/lib/etcd

ExecStart= /opt/k8s/bin/etcd \
--enable-v2=false \
Expand Down
6 changes: 5 additions & 1 deletion windows/docker-image-sync.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,14 @@ Function _all_in_one($config) {
"size" = $size
}

if ($platform.variant) {
$manifest.platform.variant = $platform.variant
}

$manifests += , $manifest
}

write-host "==> push all-in-one manifest list"
write-host "==> push all-in-one manifest list" -ForegroundColor Blue

$data = ConvertTo-Json -InputObject @{
"mediaType" = "application/vnd.docker.distribution.manifest.list.v2+json";
Expand Down
2 changes: 1 addition & 1 deletion windows/sdk/dockerhub/manifests/upload.psm1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Function New-Manifest([string]$token, [string]$image, [string]$ref, [string]$manifest_json_path, [string]$contentType = "application/vnd.docker.distribution.manifest.v2+json", [string]$registry = "registry.hub.docker.com") {
write-host "==> push [ $image $ref ] $contentType" -ForegroundColor Green
write-host "==> push [ $image $ref ] $contentType" -ForegroundColor Blue

if (!($IsWindows)) { $env:TEMP = "/tmp" }

Expand Down

0 comments on commit b8b9aec

Please sign in to comment.