Skip to content

Commit

Permalink
Merge pull request #171 from kanisterio/sync
Browse files Browse the repository at this point in the history
Kanister docs update to version 0.19.0
  • Loading branch information
SupriyaKasten committed May 8, 2019
2 parents f970ed8 + bc03b15 commit 2c7ffe1
Show file tree
Hide file tree
Showing 32 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion docs/functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ For this phase, we will use the `backupInfo` Artifact provided by backup functio
args:
namespace: "{{ .Deployment.Namespace }}"
pod: "{{ index .Deployment.Pods 0 }}"
image: kanisterio/kanister-tools:0.18.0
image: kanisterio/kanister-tools:0.19.0
backupArtifactPrefix: s3-bucket/path/artifactPrefix
backupTag: "{{ .ArtifactsIn.backupInfo.KeyValue.backupIdentifier }}"
- func: ScaleWorkload
Expand Down
2 changes: 1 addition & 1 deletion docs/helm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You also need to install the Kanister controller

.. code-block:: console
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.18.0
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.19.0
Kanister-Enabled Applications
=============================
Expand Down
6 changes: 3 additions & 3 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This will install the Kanister controller in the `kanister` namespace
$ helm repo add kanister https://charts.kanister.io/
# Install the Kanister operator controller using helm
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.18.0
$ helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.19.0
# Create an S3 Compliant Kanister profile using kanctl
$ kanctl create profile s3compliant --bucket <bucket> --access-key ${AWS_ACCESS_KEY_ID} \
Expand Down Expand Up @@ -73,5 +73,5 @@ namespace.

.. code-block:: bash
# Deploy controller version 0.18.0 to Kubernetes
$ make deploy VERSION="0.18.0"
# Deploy controller version 0.19.0 to Kubernetes
$ make deploy VERSION="0.19.0"
2 changes: 1 addition & 1 deletion docs/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ and backup to an AWS S3 bucket.
helm repo add kanister http://charts.kanister.io
# Install the Kanister Controller
helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.18.0
helm install --name myrelease --namespace kanister kanister/kanister-operator --set image.tag=0.19.0
# Install MySQL and configure its Kanister Blueprint.
# Also create a Profile CR that can be used in ActionSets
Expand Down
4 changes: 2 additions & 2 deletions docs/tooling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ The following snippet is an example of using kando from inside a Blueprint.
kando location delete --profile '{{ .Profile }}' --path '/backup/path'
kando output version 0.18.0
kando output version 0.19.0
Install the tools
=================
Expand All @@ -398,7 +398,7 @@ These tools, especially `kando` are meant to be invoked inside containers via
Blueprints. Although suggest using the released image when possible, we've also
made it simple to add these tools to your container.
The released image, `kanisterio/kanister-tools:0.18.0`, is hosted by
The released image, `kanisterio/kanister-tools:0.19.0`, is hosted by
`dockerhub <https://cloud.docker.com/swarm/kanisterio/repository/docker/kanisterio/kanister-tools/general>`_.
The Dockerfile for this image is in the
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-elasticsearch/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: kanister-elasticsearch
home: https://www.elastic.co/products/elasticsearch
version: 0.18.0
version: 0.19.0
appVersion: 6.3.1
description: Elasticsearch w/ Kanister support based on incubator/elasticsearch
icon: https://static-www.elastic.co/assets/blteb1c97719574938d/logo-elastic-elasticsearch-lt.svg
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ If you want to avoid doing that upgrade to Elasticsearch 5.6 first before moving

* Kubernetes 1.9+ with Beta APIs enabled.
* PV support on the underlying infrastructure.
* Kanister version 0.18.0 with `profiles.cr.kanister.io` CRD installed
* Kanister version 0.19.0 with `profiles.cr.kanister.io` CRD installed

## StatefulSets Details
* https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM kanisterio/kanister-tools:0.18.0
FROM kanisterio/kanister-tools:0.19.0
MAINTAINER Supriya Kharade <supriya@kasten.io>

COPY esdump-setup.sh /esdump-setup.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ actions:
name: takeDataSnapshot
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.18.0"
image: "kanisterio/es-sidecar:0.19.0"
command:
- bash
- -o
Expand All @@ -37,7 +37,7 @@ actions:
name: restoreSnapshots
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.18.0"
image: "kanisterio/es-sidecar:0.19.0"
command:
- bash
- -o
Expand All @@ -63,7 +63,7 @@ actions:
name: deleteSnapshots
args:
namespace: "{{ .StatefulSet.Namespace }}"
image: "kanisterio/es-sidecar:0.18.0"
image: "kanisterio/es-sidecar:0.19.0"
command:
- bash
- -o
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies:
- name: profile
version: "0.18.0"
version: "0.19.0"
condition: profile.create
repository: "https://charts.kanister.io"
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: 0.18.0
version: 0.19.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
Expand Up @@ -3,7 +3,7 @@
## Prerequisites Details
* Kubernetes 1.8+ with Beta APIs enabled.
* PV support on the underlying infrastructure.
* Kanister version 0.18.0 with `profiles.cr.kanister.io` CRD installed
* Kanister version 0.19.0 with `profiles.cr.kanister.io` CRD installed

## StatefulSet Details
* https://kubernetes.io/docs/concepts/abstractions/controllers/statefulsets/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies:
- name: profile
version: "0.18.0"
version: "0.19.0"
condition: profile.create
repository: "https://charts.kanister.io"
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
mountPath: /data/db
containers:
- name: kanister-sidecar
image: kanisterio/mongo-sidecar:0.18.0
image: kanisterio/mongo-sidecar:0.19.0
imagePullPolicy: Always
env:
{{- if .Values.auth.enabled }}
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-mysql/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ sources:
- https://github.com/kubernetes/charts
- https://github.com/docker-library/mysql
- https://kanister.io/
version: 0.18.0
version: 0.19.0
appVersion: 5.7.14
2 changes: 1 addition & 1 deletion examples/helm/kanister/kanister-mysql/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies:
- name: profile
version: "0.18.0"
version: "0.19.0"
condition: profile.create
repository: "https://charts.kanister.io"
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
mountPath: /etc/mysql/conf.d
{{- end }}
- name: kanister-sidecar
image: kanisterio/mysql-sidecar:0.18.0
image: kanisterio/mysql-sidecar:0.19.0
imagePullPolicy: Always
env:
{{- if .Values.mysqlAllowEmptyPassword }}
Expand Down
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: 0.18.0
version: 0.19.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies:
- name: profile
version: "0.18.0"
version: "0.19.0"
condition: profile.create
repository: "https://charts.kanister.io"
2 changes: 1 addition & 1 deletion examples/time-log/blueprint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ actions:
args:
namespace: "{{ .Deployment.Namespace }}"
pod: "{{ index .Deployment.Pods 0 }}"
image: kanisterio/kanister-tools:0.18.0
image: kanisterio/kanister-tools:0.19.0
backupArtifactPrefix: "{{ .ArtifactsIn.timeLog.KeyValue.path }}"
backupIdentifier: "{{ .ArtifactsIn.backupIdentifier.KeyValue.id }}"
- func: ScaleWorkload
Expand Down
2 changes: 1 addition & 1 deletion examples/time-log/time-logger-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: test-container
image: kanisterio/kanister-tools:0.18.0
image: kanisterio/kanister-tools:0.19.0
command: ["sh", "-c"]
args: ["while true; do for x in $(seq 1200); do date >> /var/log/time.log; sleep 1; done; truncate /var/log/time.log --size 0; done"]
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion helm/kanister-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ maintainers:
- email: tom@kasten.io
name: tdmanv
icon: https://kasten.io/assets/img/kanister-logo.png
appVersion: 0.18.0
appVersion: 0.19.0
source: https://github.com/kanisterio/kanister
2 changes: 1 addition & 1 deletion helm/kanister-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.
image:
repository: kanisterio/controller
tag: 0.18.0
tag: 0.19.0
pullPolicy: IfNotPresent
rbac:
create: true
Expand Down
2 changes: 1 addition & 1 deletion helm/profile/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A helm chart to create profile custom resource for kanister
engine: gotpl
name: profile
home: https://kanister.io/
version: 0.18.0
version: 0.19.0
maintainers:
- email: tom@kasten.io
name: tdmanv
Expand Down
2 changes: 1 addition & 1 deletion pkg/function/copy_volume_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
)

const (
kanisterToolsImage = "kanisterio/kanister-tools:0.18.0"
kanisterToolsImage = "kanisterio/kanister-tools:0.19.0"
copyVolumeDataMountPoint = "/mnt/vol_data/%s"
copyVolumeDataJobPrefix = "copy-vol-data-"
CopyVolumeDataNamespaceArg = "namespace"
Expand Down
4 changes: 2 additions & 2 deletions pkg/function/data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func newRestoreDataBlueprint(pvc, identifierArg, identifierVal string) *crv1alph
Func: "RestoreData",
Args: map[string]interface{}{
RestoreDataNamespaceArg: "{{ .StatefulSet.Namespace }}",
RestoreDataImageArg: "kanisterio/kanister-tools:0.18.0",
RestoreDataImageArg: "kanisterio/kanister-tools:0.19.0",
RestoreDataBackupArtifactPrefixArg: "{{ .Profile.Location.Bucket }}/{{ .Profile.Location.Prefix }}",
RestoreDataRestorePathArg: "/mnt/data",
RestoreDataEncryptionKeyArg: "{{ .Secrets.backupKey.Data.password | toString }}",
Expand Down Expand Up @@ -318,7 +318,7 @@ func newCopyDataTestBlueprint() crv1alpha1.Blueprint {
Func: "RestoreData",
Args: map[string]interface{}{
RestoreDataNamespaceArg: "{{ .PVC.Namespace }}",
RestoreDataImageArg: "kanisterio/kanister-tools:0.18.0",
RestoreDataImageArg: "kanisterio/kanister-tools:0.19.0",
RestoreDataBackupArtifactPrefixArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupArtifactLocation),
RestoreDataBackupTagArg: fmt.Sprintf("{{ .Options.%s }}", CopyVolumeDataOutputBackupTag),
RestoreDataVolsArg: map[string]string{
Expand Down
10 changes: 5 additions & 5 deletions pkg/function/kube_exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ func (s *KubeExecTest) TestParseLogAndCreateOutput(c *C) {
errChecker Checker
outChecker Checker
}{
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}", map[string]interface{}{"version": "0.18.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
map[string]interface{}{"version": "0.18.0", "path": "/backup/path"}, IsNil, NotNil},
{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}", map[string]interface{}{"version": "0.18.0"}, IsNil, NotNil},
{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.18.0\"}", map[string]interface{}{"version": "0.18.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.19.0\"}", map[string]interface{}{"version": "0.19.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.19.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
map[string]interface{}{"version": "0.19.0", "path": "/backup/path"}, IsNil, NotNil},
{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.19.0\"}", map[string]interface{}{"version": "0.19.0"}, IsNil, NotNil},
{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.19.0\"}", map[string]interface{}{"version": "0.19.0"}, IsNil, NotNil},
{"###Phase-output###: Invalid message", nil, NotNil, IsNil},
{"Random message", nil, IsNil, IsNil},
} {
Expand Down
4 changes: 2 additions & 2 deletions pkg/function/kube_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ func newTaskBlueprint(namespace string) *crv1alpha1.Blueprint {
Func: "KubeTask",
Args: map[string]interface{}{
KubeTaskNamespaceArg: namespace,
KubeTaskImageArg: "kanisterio/kanister-tools:0.18.0",
KubeTaskImageArg: "kanisterio/kanister-tools:0.19.0",
KubeTaskCommandArg: []string{
"sh",
"-c",
"kando output version 0.18.0",
"kando output version 0.19.0",
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/kube/pod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (s *PodSuite) TestPod(c *C) {
pod, err := CreatePod(context.Background(), s.cli, &PodOptions{
Namespace: s.namespace,
GenerateName: "test-",
Image: "kanisterio/kanister-tools:0.18.0",
Image: "kanisterio/kanister-tools:0.19.0",
Command: []string{"sh", "-c", "tail -f /dev/null"},
})
c.Assert(err, IsNil)
Expand All @@ -78,7 +78,7 @@ func (s *PodSuite) TestPodWithVolumes(c *C) {
pod, err := CreatePod(ctx, cli, &PodOptions{
Namespace: s.namespace,
GenerateName: "test-",
Image: "kanisterio/kanister-tools:0.18.0",
Image: "kanisterio/kanister-tools:0.19.0",
Command: []string{"sh", "-c", "tail -f /dev/null"},
Volumes: vols,
})
Expand All @@ -94,7 +94,7 @@ func (s *PodSuite) TestGetPodLogs(c *C) {
pod, err := CreatePod(context.Background(), s.cli, &PodOptions{
Namespace: s.namespace,
GenerateName: "test-",
Image: "kanisterio/kanister-tools:0.18.0",
Image: "kanisterio/kanister-tools:0.19.0",
Command: []string{"sh", "-c", "echo hello"},
})
c.Assert(err, IsNil)
Expand Down
2 changes: 1 addition & 1 deletion pkg/param/param_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ func (s *ParamsSuite) TestPhaseParams(c *C) {
c.Assert(tp.Phases, IsNil)
err = InitPhaseParams(ctx, s.cli, tp, "backup", nil)
c.Assert(err, IsNil)
UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.18.0"})
UpdatePhaseParams(ctx, tp, "backup", map[string]interface{}{"version": "0.19.0"})
c.Assert(tp.Phases, HasLen, 1)
c.Assert(tp.Phases["backup"], NotNil)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/testutil/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func newTestPodTemplateSpec() v1.PodTemplateSpec {
Containers: []v1.Container{
v1.Container{
Name: "test-container",
Image: "kanisterio/kanister-tools:0.18.0",
Image: "kanisterio/kanister-tools:0.19.0",
Command: []string{"tail"},
Args: []string{"-f", "/dev/null"},
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/get.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ cleanup() {
}

main() {
version="${1:-"0.18.0"}"
version="${1:-"0.19.0"}"
initArch
initOS
verifySupported
Expand Down

0 comments on commit 2c7ffe1

Please sign in to comment.