Skip to content

Commit

Permalink
Propose the spec change for CRD
Browse files Browse the repository at this point in the history
Signed-off-by: Swapnil Mhamane <swapnil.mhamane@sap.com>
  • Loading branch information
Swapnil Mhamane committed Oct 14, 2019
1 parent 89bc639 commit 2ff20a8
Show file tree
Hide file tree
Showing 145 changed files with 17,537 additions and 10,946 deletions.
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ fmt:

# Run go vet against code
vet:
go vet ./...
PACKAGES="$(shell go list -mod=vendor -e ./... | grep -vE '/api|/api/v1alpha1')"
go vet $(PACKAGES)

# Generate code
generate: controller-gen
Expand All @@ -76,3 +77,13 @@ CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
else
CONTROLLER_GEN=$(shell which controller-gen)
endif

.PHONY: revendor
revendor:
@env GO111MODULE=on go mod vendor -v
@env GO111MODULE=on go mod tidy -v

.PHONY: update-dependencies
update-dependencies:
@env GO111MODULE=on go get -u
@make revendor
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "2"
domain: sapcloud.io
domain: gardener.cloud
repo: github.com/gardener/etcd-druid
resources:
- group: druid
version: v1
version: v1alpha1
kind: Etcd
29 changes: 7 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,15 @@ The existing method of deploying etcd and backup-sidecar as a StatefulSet allevi
The etcd CRD should contain the information required to create the etcd and backup-restore sidecar in a pod/statefulset.

```yaml
---
---

apiVersion: druid.sapcloud.io/v1
apiVersion: druid.gardener.cloud/v1
kind: Etcd
metadata:
annotations:
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"druid.sapcloud.io/v1","kind":"Etcd","metadata":{"annotations":{},"labels":{"app":"etcd-statefulset","garden.sapcloud.io/role":"controlplane","role":"test"},"name":"test","namespace":"shoot--dev--i308301-1"},"spec":{"annotations":{"app":"etcd-statefulset","garden.sapcloud.io/role":"controlplane","networking.gardener.cloud/to-dns":"allowed","networking.gardener.cloud/to-private-networks":"allowed","networking.gardener.cloud/to-public-networks":"allowed","role":"test"},"backup":{"deltaSnapshotMemoryLimit":104857600,"deltaSnapshotPeriod":"300s","etcdConnectionTimeout":"300s","etcdQuotaBytes":8589934592,"fullSnapshotSchedule":"0 */24 * * *","garbageCollectionPeriod":"43200s","garbageCollectionPolicy":"Exponential","imageRepository":"eu.gcr.io/gardener-project/gardener/etcdbrctl","imageVersion":"0.8.0-dev","port":8080,"pullPolicy":"IfNotPresent","resources":{"limits":{"cpu":"500m","memory":"2Gi"},"requests":{"cpu":"23m","memory":"128Mi"}},"snapstoreTempDir":"/var/etcd/data/temp"},"etcd":{"clientPort":2379,"defragmentationSchedule":"0 */24 * * *","enableTLS":false,"imageRepository":"quay.io/coreos/etcd","imageVersion":"v3.3.13","initialClusterState":"new","initialClusterToken":"new","metrics":"basic","pullPolicy":"IfNotPresent","resources":{"limits":{"cpu":"2500m","memory":"4Gi"},"requests":{"cpu":"500m","memory":"1000Mi"}},"serverPort":2380,"storageCapacity":"80Gi","storageClass":"gardener.cloud-fast"},"labels":{"app":"etcd-statefulset","garden.sapcloud.io/role":"controlplane","networking.gardener.cloud/to-dns":"allowed","networking.gardener.cloud/to-private-networks":"allowed","networking.gardener.cloud/to-public-networks":"allowed","role":"test"},"pvcRetentionPolicy":"DeleteAll","replicas":1,"storageCapacity":"80Gi","storageClass":"gardener.cloud-fast","store":{"storageContainer":"shoot--dev--i308301-1--b3caa","storageProvider":"S3","storePrefix":"etcd-test","storeSecret":"etcd-backup"},"tlsClientSecret":"etcd-client-tls","tlsServerSecret":"etcd-server-tls"}}
creationTimestamp: 2019-09-12T12:20:04Z
finalizers:
- druid.sapcloud.io/etcd-druid
generation: 3
labels:
app: etcd-statefulset
garden.sapcloud.io/role: controlplane
role: test
- druid.gardener.cloud/etcd
name: test
namespace: shoot--dev--i308301-1
resourceVersion: "75172656"
selfLink: /apis/druid.sapcloud.io/v1/namespaces/shoot--dev--i308301-1/etcds/test
uid: a6afc65f-d557-11e9-8ea7-469a1879b8a9
namespace: demo
spec:
annotations:
app: etcd-statefulset
Expand All @@ -55,17 +43,13 @@ spec:
networking.gardener.cloud/to-public-networks: allowed
role: test
backup:
deltaSnapshotMemoryLimit: 104857600
deltaSnapshotMemoryLimit: 1Gi
deltaSnapshotPeriod: 300s
etcdConnectionTimeout: 300s
etcdQuotaBytes: 8589934592
fullSnapshotSchedule: 0 */24 * * *
garbageCollectionPeriod: 43200s
garbageCollectionPolicy: Exponential
imageRepository: eu.gcr.io/gardener-project/gardener/etcdbrctl
imageVersion: 0.8.0-dev
Version: 0.8.0-dev
port: 8080
pullPolicy: IfNotPresent
resources:
limits:
cpu: 500m
Expand All @@ -75,6 +59,7 @@ spec:
memory: 128Mi
snapstoreTempDir: /var/etcd/data/temp
etcd:
Quota: 8Gi
clientPort: 2379
defragmentationSchedule: 0 */24 * * *
enableTLS: false
Expand Down
36 changes: 0 additions & 36 deletions api/v1/groupversion_info.go

This file was deleted.

Loading

0 comments on commit 2ff20a8

Please sign in to comment.