Skip to content

Commit

Permalink
Merge pull request #160 from kanisterio/sync
Browse files Browse the repository at this point in the history
Add GCP, AWS Obj store support, IBM blockstorage, upgrade client pkg to 1.12, upgrade k8s lib 1.13, remove awscli
  • Loading branch information
SupriyaKasten committed Mar 10, 2019
2 parents 6df03b7 + 56f1064 commit c6872ff
Show file tree
Hide file tree
Showing 53 changed files with 1,974 additions and 494 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ IMAGE_NAME := $(BIN)

IMAGE := $(REGISTRY)/$(IMAGE_NAME)

BUILD_IMAGE ?= kanisterio/build:0.13.1-go1.9
BUILD_IMAGE ?= kanisterio/build:0.13.2-go1.11
DOCS_BUILD_IMAGE ?= kanisterio/docker-sphinx

DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
Expand Down
6 changes: 5 additions & 1 deletion build/release_helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ release_helm_charts() {
fi

mkdir ${package_folder}
helm dep update ${chart_path}
local out=$(helm package ${chart_path} --version ${version} -d ${package_folder})
[[ ${out} =~ ^.*/(.*\.tgz)$ ]]
local chart_tar=${BASH_REMATCH[1]}
Expand All @@ -36,6 +35,8 @@ release_helm_charts() {
echo "Uploading chart and index file"
aws s3 cp ${package_folder}/${chart_tar} ${HELM_RELEASE_BUCKET}
aws s3 cp ${package_folder}/index.yaml ${HELM_RELEASE_BUCKET}
cp -f ${package_folder}/index.yaml ${HELM_HOME:-${HOME}/.helm}/repository/cache/kanister-index.yaml
cp -f ${package_folder}/${chart_tar} ${HELM_HOME:-${HOME}/.helm}/cache/archive/
}

main() {
Expand All @@ -49,6 +50,9 @@ main() {
local -a example_charts=( "kanister-mongodb-replicaset" "kanister-mysql" "kanister-postgresql" "kanister-elasticsearch")
for chart_name in "${example_charts[@]}"
do
#profile chart is a dependency which will not be avalible due slow cloud caching
[ -d examples/helm/kanister/${chart_name}/charts/ ] || mkdir -p examples/helm/kanister/${chart_name}/charts/
cp ${HELM_HOME:-${HOME}/.helm}/cache/archive/profile-${version}.tgz examples/helm/kanister/${chart_name}/charts/
release_helm_charts "examples/helm/kanister/${chart_name}" "${version}"
done

Expand Down
7 changes: 2 additions & 5 deletions docker/tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM busybox:glibc as restbox

# Get restic executable
ENV RESTIC_VERSION=0.9.1
ENV RESTIC_VERSION=0.9.4
ADD https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/restic_${RESTIC_VERSION}_linux_amd64.bz2 /
RUN bzip2 -d restic_${RESTIC_VERSION}_linux_amd64.bz2 && mv restic_${RESTIC_VERSION}_linux_amd64 /bin/restic && chmod +x /bin/restic

Expand All @@ -10,10 +10,7 @@ MAINTAINER Tom Manville <tom@kasten.io>

COPY --from=restbox /bin/restic /bin/restic

RUN apk -v --update add --no-cache bash curl python py-pip groff less mailcap ca-certificates && \
pip install --upgrade pip && \
pip install --upgrade awscli && \
apk -v --purge del py-pip && \
RUN apk -v --update add --no-cache bash curl groff less mailcap ca-certificates && \
rm -f /var/cache/apk/*

RUN curl https://raw.githubusercontent.com/kanisterio/kanister/master/scripts/get.sh | bash
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: kanister-mongodb-replicaset
home: https://github.com/mongodb/mongo
version: 3.5.2
version: 0.16.0
appVersion: 3.6
description: Kanister-enabled NoSQL document-oriented database that stores JSON-like documents with
dynamic schemas, simplifying the integration of data in content-driven applications.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
profile:
create: true
defaultProfile: true
s3:
accessKey: SomeBogusTestKey=
secretKey: SomeTestSecrest==
bucket: linttestname
5 changes: 3 additions & 2 deletions examples/helm/kanister/kanister-mysql/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ keywords:
- kanister
maintainers:
- email: tom@kasten.io
name: Tom Manville
name: tdmanv
name: kanister-mysql
sources:
- https://github.com/kubernetes/charts
- https://github.com/docker-library/mysql
- https://kanister.io/
version: 1.1.2
version: 0.16.0
appVersion: 5.7.14
7 changes: 7 additions & 0 deletions examples/helm/kanister/kanister-mysql/ci/lint-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
profile:
create: true
defaultProfile: true
s3:
accessKey: SomeBogusTestKey=
secretKey: SomeTestSecrest==
bucket: linttestname
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-postgresql/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ sources:
- https://github.com/kansiterio/blueprint-helm-charts
- https://github.com/kubernetes/charts
- https://github.com/docker-library/postgres
version: 9.6.2
version: 0.16.0
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-postgresql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[PostgreSQL](https://postgresql.org) is a powerful, open source object-relational database system. It has more than 15 years of active development and a proven architecture that has earned it a strong reputation for reliability, data integrity, and correctness.

[Kanister](https://kansiter.io) is a framework that enables application-level data management on Kubernetes.
[Kanister](https://kanister.io) is a framework that enables application-level data management on Kubernetes.

## Introduction

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
profile:
create: true
defaultProfile: true
s3:
accessKey: SomeBogusTestKey=
secretKey: SomeTestSecrest==
bucket: linttestname
Loading

0 comments on commit c6872ff

Please sign in to comment.