Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8s - etcd - Add annotations #2844

Merged
merged 6 commits into from
Jan 28, 2025
Merged

K8s - etcd - Add annotations #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5aba7e
K8s - etcd - Add annotations
armandomiani Jan 13, 2025
85afbdb
Merge branch 'master' into miani-k8s-etcd-20250113
armandomiani Jan 14, 2025
1a220ce
Merge branch 'master' into miani-k8s-etcd-20250113
armandomiani Jan 27, 2025
9ee491a
fix: add ca-certificates
armandomiani Jan 27, 2025
d1c69bc
fix: reduce required resources for running in small clusters
armandomiani Jan 27, 2025
5d017c5
Merge branch 'miani-k8s-etcd-20250113' of github.com:GoogleCloudPlatf…
armandomiani Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions k8s/etcd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CHART_NAME := etcd
APP_ID ?= $(CHART_NAME)

TRACK ?= 3.5
SERVICE_NAME := services/8179d7ea-7a6d-4054-b2bc-27caef69db5a.cloudpartnerservices.goog

METRICS_EXPORTER_TAG ?= v0.11.1-gke.1

Expand Down
7 changes: 4 additions & 3 deletions k8s/etcd/apptest/tester/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.5
FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8

RUN apt-get update && apt-get install -y --no-install-recommends \
wget \
ca-certificates \
curl \
&& rm -rf /var/lib/apt/lists/*

RUN wget -q -O /bin/kubectl \
RUN curl -L -o /bin/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl \
&& chmod 755 /bin/kubectl

Expand Down
2 changes: 1 addition & 1 deletion k8s/etcd/chart/etcd/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
- "/setup.sh"
resources:
requests:
cpu: 500m
cpu: 200m
memory: 1Gi
env:
- name: MY_POD_IP
Expand Down
Loading