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

Jump to bottom

Bug 1821666: thanos ruler secret cleanup #765

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Bug 1821666: thanos ruler secret cleanup #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adf7609
Bug 1821666: thanos ruler secret cleanup
pgier Apr 23, 2020
68955dd
pin jsonnet-ci build image to specific version
pgier Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONTAINER_CMD:=docker run --rm \
-v "$(PWD):/go/src/$(GO_PKG):Z" \
-w "/go/src/$(GO_PKG)" \
-e GO111MODULE=$(GO111MODULE) \
quay.io/coreos/jsonnet-ci
quay.io/coreos/jsonnet-ci:release-0.38

.PHONY: all
all: format generate build test
Expand Down
29 changes: 29 additions & 0 deletions pkg/tasks/thanos_ruler_user_workload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,35 @@ func (t *ThanosRulerUserWorkloadTask) destroy() error {
return errors.Wrap(err, "deleting Thanos Ruler query config Secret failed")
}

grpcTLS, err := t.factory.GRPCSecret(nil)
if err != nil {
return errors.Wrap(err, "initializing UserWorkload Thanos Ruler GRPC secret failed")
}

grpcTLS, err = t.client.WaitForSecret(grpcTLS)
if err != nil {
return errors.Wrap(err, "waiting for UserWorkload Thanos Ruler GRPC secret failed")
}

s, err = t.factory.ThanosRulerGrpcTLSSecret()
if err != nil {
return errors.Wrap(err, "error initializing UserWorkload Thanos Ruler GRPC TLS secret")
}

s, err = t.factory.HashSecret(s,
"ca.crt", string(grpcTLS.Data["ca.crt"]),
"server.crt", string(grpcTLS.Data["prometheus-server.crt"]),
"server.key", string(grpcTLS.Data["prometheus-server.key"]),
)
if err != nil {
return errors.Wrap(err, "error hashing UserWorkload Thanos Ruler GRPC TLS secret")
}

err = t.client.DeleteSecret(s)
if err != nil {
return errors.Wrap(err, "error deleting UserWorkload Thanos Ruler GRPC TLS secret")
}

acs, err := t.factory.ThanosRulerAlertmanagerConfigSecret()
if err != nil {
return errors.Wrap(err, "initializing Thanos Ruler Alertmanager config Secret failed")
Expand Down