Skip to content

Commit

Permalink
v4.4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Andersen committed May 2, 2017
1 parent 3c9221b commit 3998438
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 18 deletions.
4 changes: 2 additions & 2 deletions containers/etcd/rebuild.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
docker build -t btrdb/etcd:3.1.5 .
docker push btrdb/etcd:3.1.5
docker build --no-cache -t btrdb/etcd:3.1.7 .
docker push btrdb/etcd:3.1.7
3 changes: 2 additions & 1 deletion devtools/make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pushd $GOPATH/src/github.com/SoftwareDefinedBuildings/btrdb/btrdbd
go build
btrdb_ver=`./btrdbd -version`
echo "BTrDB version is $btrdb_ver"

target_ver=$btrdb_ver
popd

Expand Down Expand Up @@ -99,7 +100,7 @@ pushd $GOPATH/src/github.com/SoftwareDefinedBuildings/mr-plotter/container
cp ../mr-plotter .
cp ../tools/hardcodecert/hardcodecert .
cp ../tools/setsessionkeys/setsessionkeys .
docker build -t btrdb/${PFX}mrplotter:$target_ver .
docker build --no-cache -t btrdb/${PFX}mrplotter:$target_ver .
docker push btrdb/${PFX}mrplotter:$target_ver
popd

Expand Down
8 changes: 4 additions & 4 deletions k8s_tools/kcm-ceph/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM ubuntu:xenial

ENV ETCDCTL_VERSION v3.1.3
ENV ETCDCTL_VERSION v3.1.7
ENV ETCDCTL_ARCH linux-amd64
ENV CEPH_VERSION jewel
ENV KUBE_VERSION v1.6.1

ENV KUBE_VERSION v1.6.2
ENV GO_VERSION 1.8.1
RUN apt-get update && apt-get install -y net-tools git build-essential wget
RUN wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
echo "deb http://download.ceph.com/debian-${CEPH_VERSION}/ xenial main" | tee /etc/apt/sources.list.d/ceph-${CEPH_VERSION}.list && \
apt-get update && apt-get install -y --force-yes ceph radosgw librados-dev rbd-mirror vim net-tools git build-essential && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
wget -q -O- "https://github.com/coreos/etcd/releases/download/${ETCDCTL_VERSION}/etcd-${ETCDCTL_VERSION}-${ETCDCTL_ARCH}.tar.gz" |tar xfz - -C/tmp/ etcd-${ETCDCTL_VERSION}-${ETCDCTL_ARCH}/etcdctl && \
mv /tmp/etcd-${ETCDCTL_VERSION}-${ETCDCTL_ARCH}/etcdctl /usr/local/bin/etcdctl
RUN wget -O /tmp/go.tar.gz https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz && tar -xf /tmp/go.tar.gz -C /usr/local/ && rm /tmp/go.tar.gz && mkdir /srv/go
RUN wget -O /tmp/go.tar.gz https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz && tar -xf /tmp/go.tar.gz -C /usr/local/ && rm /tmp/go.tar.gz && mkdir /srv/go
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/srv/target:/srv/go/bin GOPATH=/srv/go
RUN go get k8s.io/kubernetes/cmd/kube-controller-manager && \
cd $GOPATH/src/k8s.io/kubernetes/cmd/kube-controller-manager && \
Expand Down
4 changes: 2 additions & 2 deletions k8s_tools/kcm-ceph/rebuild.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -ex
docker build -t btrdb/kubernetes-controller-manager-rbd:1.6.1 .
docker push btrdb/kubernetes-controller-manager-rbd:1.6.1
docker build -t btrdb/kubernetes-controller-manager-rbd:1.6.2 .
docker push btrdb/kubernetes-controller-manager-rbd:1.6.2
6 changes: 5 additions & 1 deletion manifest_templates/btrdb.statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
requests:
cpu: "10"
# changing this memory limit will not change how much memory
# btrdb tries to use. That feature will come later
# btrdb tries to use. That is tweaked by BLOCK_CACHE below
memory: 32Gi
env:
- name: ETCD_ENDPOINT
Expand All @@ -45,6 +45,10 @@ spec:
value: {{.SiteInfo.Ceph.BTrDBPool}}
- name: CEPH_DATA_POOL
value: {{.SiteInfo.Ceph.BTrDBPool}}
- name: BTRDB_BLOCK_CACHE
value: "1000000"
- name: BTRDB_ENABLE_OVERWATCH
value: "yes"
- name: MY_POD_NAME
valueFrom:
fieldRef:
Expand Down
4 changes: 2 additions & 2 deletions manifest_templates/etcd.statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
image: btrdb/etcd:3.1.3
image: btrdb/etcd:3.1.7
imagePullPolicy: Always
ports:
- containerPort: 2379
Expand Down Expand Up @@ -86,7 +86,7 @@ spec:
spec:
containers:
- name: backup
image: btrdb/etcd:3.1.3
image: btrdb/etcd:3.1.7
args:
- backup
imagePullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion mfgen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

//go:generate go-bindata -o templates.go -prefix ../manifest_templates ../manifest_templates/

const PackageVersion = "4.4.7"
const PackageVersion = "4.4.9"

func main() {
app := cli.NewApp()
Expand Down
8 changes: 4 additions & 4 deletions mfgen/templates.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ package tools

const VersionMajor = 4
const VersionMinor = 4
const VersionPatch = 8
const VersionPatch = 9

0 comments on commit 3998438

Please sign in to comment.