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.

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

Merge the CLI 'installValues' type with Helm 'Values' type #3291

Merged
merged 10 commits into from
Aug 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile-proxy
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN (proxy=$(bin/fetch-proxy $(cat proxy-version)) && \
mv "$proxy" linkerd2-proxy)

## compile proxy-identity agent
FROM gcr.io/linkerd-io/go-deps:c7fb42bd as golang
FROM gcr.io/linkerd-io/go-deps:773dfbc7 as golang
WORKDIR /linkerd-build
COPY pkg/flags pkg/flags
COPY pkg/tls pkg/tls
Expand Down
2 changes: 1 addition & 1 deletion charts/linkerd2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Identity:
GrafanaImage: gcr.io/linkerd-io/grafana

# heartbeat configuration
HeartbeatSchedule: "0 0 * * * "
HeartbeatSchedule: "0 0 * * *"

# prometheus configuration
PrometheusImage: prom/prometheus:v2.11.1
Expand Down
2 changes: 1 addition & 1 deletion cli/Dockerfile-bin
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## compile binaries
FROM gcr.io/linkerd-io/go-deps:c7fb42bd as golang
FROM gcr.io/linkerd-io/go-deps:773dfbc7 as golang
WORKDIR /linkerd-build
COPY cli cli
COPY charts charts
Expand Down
Loading