Skip to content
This repository was archived by the owner on Feb 14, 2022. It is now read-only.

Commit

Permalink
vendor: Bump etcd and gRPC
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Crone <[email protected]>
  • Loading branch information
chris-crone committed Oct 1, 2019
1 parent a2368c5 commit 76adfbf
Show file tree
Hide file tree
Showing 210 changed files with 38,810 additions and 9,946 deletions.
91 changes: 77 additions & 14 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@

[[override]]
name = "google.golang.org/grpc"
version = "~v1.12.2"
version = "~v1.24.0"

[[override]]
name = "github.com/ugorji/go"
revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57"

[[override]]
name = "github.com/coreos/etcd"
revision = "v3.3.9"
revision = "v3.3.15"

[[override]]
name = "k8s.io/api"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ e2e-benchmark-kind-circleci:

e2e-kind-pods-info:
kubectl --kubeconfig=$(shell kind get kubeconfig-path --name="compose-on-kube") get pods --all-namespaces

e2e-no-provisioning: e2e-binary ## run the e2e tests on an already provisionned cluster
ginkgo -v -p e2e/e2e.test -- --skip-provisioning $(TEST_ARGS) 2>&1 | tee e2e-test-output.txt
grep SUCCESS e2e-test-output.txt | grep -q "$(E2E_EXPECTED_SKIP) Skipped"
Expand Down
9 changes: 4 additions & 5 deletions docs/deploy-etcd.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
`etcd` is deployed using Helm so we must first install the Helm server:

- Create the tiller service account: `kubectl -n kube-system create serviceaccount tiller`.
- Give it admin access to your cluster (note: you might want to reduce the scope of this): `kubectl -n kube-system create clusterrolebinding tiller --clusterrole cluster-admin --serviceaccount
kube-system:tiller`.
- Give it admin access to your cluster (note: you might want to reduce the scope of this): `kubectl -n kube-system create clusterrolebinding tiller --clusterrole cluster-admin --serviceaccount kube-system:tiller`.
- Run `helm init --service-account tiller` to initialize the helm component.
- Run `kubectl get pods --namespace kube-system` and check that the tiller-deploy container was created and is in running state
```
Expand All @@ -18,7 +17,7 @@ tiller-deploy-5d6cc99fc-qdv4q 1/1 Running 0 8s

- Make sure the `compose` namespace exists on your cluster.
- Run `helm install --name etcd-operator stable/etcd-operator --namespace compose` to install the etcd-operator chart.
- Run `kubectl get pods --namespace compose` and check that etcd-operator containers were created and are in running state.
- Run `kubectl get pods --namespace compose` and check that etcd-operator containers were created and are in running state.
```
NAME READY STATUS RESTARTS AGE
etcd-operator-etcd-operator-etcd-backup-operator-ddd46947d4twzb 1/1 Running 0 22m
Expand All @@ -39,7 +38,7 @@ metadata:
namespace: "compose"
spec:
size: 3
version: "3.2.13"
version: "3.3.15"
pod:
affinity:
podAntiAffinity:
Expand All @@ -64,7 +63,7 @@ compose-etcd-nqmcwk4gdf 1/1 Runnin
compose-etcd-sxplrdthp6 1/1 Running 0 20m
```

**Note: this cluster configuration is really naive and does does not use mutual TLS to authenticate application accessing the data. For enabling mutual TLS, please refer to https://github.com/coreos/etcd-operator**
**Note: this cluster configuration is really naive and does does not use mutual TLS to authenticate application accessing the data. For enabling mutual TLS, please refer to https://github.com/coreos/etcd-operator**

### Option 2: Create a secure and highly available etcd cluster

Expand Down
3 changes: 0 additions & 3 deletions scripts/dep-refresh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,3 @@ done

# remove broken links
find ./vendor -type l -exec test ! -e {} \; -print | xargs rm -f

# for some reason, etcd/cmd/etcd symlink symlink (which is not referenced anywhere) is buggy when vendoring on windows. just remove it for now
rm ./vendor/github.com/coreos/etcd/cmd/etcd
Loading

0 comments on commit 76adfbf

Please sign in to comment.