Skip to content
This repository has been archived by the owner on Dec 1, 2018. It is now read-only.

Update influxdb and grafana dependencies #1993

Merged
merged 5 commits into from
Jul 3, 2018
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 deploy/kube-config/influxdb/grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: grafana
image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
image: k8s.gcr.io/heapster-grafana-amd64:v5.0.4
ports:
- containerPort: 3000
protocol: TCP
Expand Down
2 changes: 1 addition & 1 deletion deploy/kube-config/influxdb/influxdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: influxdb
image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3
image: k8s.gcr.io/heapster-influxdb-amd64:v1.5.2
volumeMounts:
- mountPath: /data
name: influxdb-storage
Expand Down
16 changes: 8 additions & 8 deletions grafana/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,37 @@

all: build

VERSION?=v4.4.3
DEB_VERSION?=4.4.3
VERSION?=v5.0.4
DEB_VERSION?=5.0.4

PREFIX?=staging-k8s.gcr.io
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
LDFLAGS=-w -X main.version=$(VERSION) -X main.commit=unknown-dev -X main.timestamp=0 -extldflags '-static'
KUBE_CROSS_IMAGE=k8s.gcr.io/kube-cross:v1.8.3-2
KUBE_CROSS_IMAGE=k8s.gcr.io/kube-cross:v1.9.3-2

ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x

# Set default base image dynamically for each arch
ifeq ($(ARCH),amd64)
BASEIMAGE?=busybox
BASEIMAGE?=busybox:glibc
CC=gcc
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=armhf/busybox
BASEIMAGE?=armhf/busybox:glibc
CC=arm-linux-gnueabihf-gcc
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/busybox
BASEIMAGE?=aarch64/busybox:glibc
CC=aarch64-linux-gnu-gcc
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=ppc64le/busybox
BASEIMAGE?=ppc64le/busybox:glibc
CC=powerpc64le-linux-gnu-gcc
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=s390x/busybox
BASEIMAGE?=s390x/busybox:glibc
CC=s390x-linux-gnu-gcc
endif

Expand Down
2 changes: 1 addition & 1 deletion grafana/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Grafana Image For Heapster/InfluxDB

## What's in it:
- Grafana 4
- Grafana 5
- A Go binary that:
- creates a datasource for InfluxDB
- creates a couple of dashboards during startup.
Expand Down
3 changes: 3 additions & 0 deletions grafana/RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release Notes for Grafana container.

## 5.0.4 (18-04-2018)
- Support Grafana 5.0.4.

## 4.4.1 (18-07-2017)
- Image includes grafana.ini configuration file.
- Support Grafana 4.4.1.
Expand Down
4 changes: 2 additions & 2 deletions influxdb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

all: build

VERSION?=v1.3.3
VERSION?=v1.5.2
PREFIX?=staging-k8s.gcr.io
ARCH?=amd64
GOLANG_VERSION=1.8
GOLANG_VERSION=1.10
TEMP_DIR:=$(shell mktemp -d)

ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
Expand Down
3 changes: 3 additions & 0 deletions influxdb/RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release Notes for the Heapster InfluxDB container.

## v1.5.2 (04-18-2018)
- Updated to version 1.5.2; bumped Go build container to 1.10

## v1.1.1 (11.1.2016)
- Updated to version v1.1.1; bumped Godeps and modified some code in heapster to use the latest schema

Expand Down