Skip to content

Commit

Permalink
Merge pull request observatorium#19 from open-cluster-management/fix_…
Browse files Browse the repository at this point in the history
…coredump

Update locutus to fix coredump issue
  • Loading branch information
openshift-merge-robot authored Mar 22, 2021
2 parents 1400ddc + 0c1a65b commit 5288070
Show file tree
Hide file tree
Showing 6 changed files with 872 additions and 266 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Build the manager binary
FROM golang:1.13.3-alpine3.10 as builder
# TODO(kakkoyun): Upgrade Go version.
FROM golang:1.14-alpine as builder

RUN apk add --update --no-cache git bash
WORKDIR /workspace
Expand All @@ -16,7 +15,7 @@ FROM alpine:3.10 as runner

WORKDIR /
COPY --from=builder /workspace/operator/locutus /
COPY --from=builder /workspace/operator/jsonnet /environments/operator
COPY --from=builder /workspace/operator/jsonnet /
COPY --from=builder /workspace/components/ /components/
COPY --from=builder /workspace/operator/jsonnet/vendor/ /vendor/

Expand Down Expand Up @@ -48,4 +47,4 @@ LABEL vendor="Observatorium" \
org.label-schema.vendor="observatorium/operator" \
org.label-schema.version=$VERSION

ENTRYPOINT ["/locutus", "--renderer=jsonnet", "--renderer.jsonnet.entrypoint=environments/operator/main.jsonnet", "--trigger=resource", "--trigger.resource.config=environments/operator/config.yaml"]
ENTRYPOINT ["/locutus", "--renderer=jsonnet", "--renderer.jsonnet.entrypoint=main.jsonnet", "--trigger=resource", "--trigger.resource.config=config.yaml"]
27 changes: 4 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,30 +1,11 @@
module github.com/open-cluster-management/observatorium-operator
module github.com/open-cluster-management/observatorium-operator

go 1.14

require (
github.com/brancz/locutus v0.0.0-20201009124404-2b6852bd3b57
github.com/go-logr/logr v0.2.1 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/go-jsonnet v0.16.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/jsonnet-bundler/jsonnet-bundler v0.4.0
github.com/observatorium/observatorium v0.1.1
github.com/prometheus/common v0.14.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
golang.org/x/net v0.0.0-20200927032502-5d4f70055728 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
golang.org/x/sys v0.0.0-20200926100807-9d91bd62050c // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
k8s.io/api v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/klog/v2 v2.3.0 // indirect
k8s.io/utils v0.0.0-20200912215256-4140de9c8800 // indirect
github.com/brancz/locutus v0.0.0-20210128123435-d14dd83a9c0b
k8s.io/api v0.20.5
k8s.io/apimachinery v0.20.5
sigs.k8s.io/controller-runtime v0.5.0
sigs.k8s.io/controller-tools v0.2.8
)
Loading

0 comments on commit 5288070

Please sign in to comment.