Skip to content

Commit

Permalink
Use memcached 1.6.22 (#594)
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha authored Jan 4, 2024
1 parent dd6f070 commit 26418aa
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion docs/examples/memcached/cli/memcached-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
resources:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/custom-config/mc-custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 1
version: "1.5.4-v1"
version: "1.6.22"
configSecret:
name: mc-custom-config
podTemplate:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/custom-rbac/mc-custom-db-two.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
serviceAccountName: my-custom-serviceaccount
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/custom-rbac/mc-custom-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
serviceAccountName: my-custom-serviceaccount
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/monitoring/builtin-prom-memcd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 1
version: "1.5.4-v1"
version: "1.6.22"
terminationPolicy: WipeOut
podTemplate:
spec:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/monitoring/coreos-prom-memcd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
terminationPolicy: WipeOut
podTemplate:
spec:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/private-registry/demo-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
resources:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/memcached/quickstart/demo-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
resources:
Expand Down
20 changes: 10 additions & 10 deletions docs/guides/memcached/cli/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ cat memcached-demo.yaml | kubectl create -f -
```bash
$ kubectl get memcached
NAME VERSION STATUS AGE
memcached-demo 1.5.4-v1 Running 40s
memcached-dev 1.5.4-v1 Running 40s
memcached-prod 1.5.4-v1 Running 40s
memcached-qa 1.5.4-v1 Running 40s
memcached-demo 1.6.22 Running 40s
memcached-dev 1.6.22 Running 40s
memcached-prod 1.6.22 Running 40s
memcached-qa 1.6.22 Running 40s
```

To get YAML of an object, use `--output=yaml` flag.
Expand Down Expand Up @@ -85,7 +85,7 @@ spec:
memory: 64Mi
replicas: 3
terminationPolicy: Halt
version: 1.5.4-v1
version: 1.6.22
status:
observedGeneration: 1$7916315637361465932
phase: Running
Expand All @@ -102,10 +102,10 @@ To list all KubeDB objects, use following command:
```bash
$ kubectl get all -o wide
NAME VERSION STATUS AGE
mc/memcached-demo 1.5.4-v1 Running 3h
mc/memcached-dev 1.5.4-v1 Running 3h
mc/memcached-prod 1.5.4-v1 Running 3h
mc/memcached-qa 1.5.4-v1 Running 3h
mc/memcached-demo 1.6.22 Running 3h
mc/memcached-dev 1.6.22 Running 3h
mc/memcached-prod 1.6.22 Running 3h
mc/memcached-qa 1.6.22 Running 3h
```

Flag `--output=wide` is used to print additional information.
Expand All @@ -120,7 +120,7 @@ You can print labels with objects. The following command will list all Memcached
```bash
$ kubectl get mc --show-labels
NAME VERSION STATUS AGE LABELS
memcached-demo 1.5.4-v1 Running 2m kubedb=cli-demo
memcached-demo 1.6.22 Running 2m kubedb=cli-demo
```

To print only object name, run the following command:
Expand Down
6 changes: 3 additions & 3 deletions docs/guides/memcached/concepts/catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ As with all other Kubernetes objects, a MemcachedVersion needs `apiVersion`, `ki
apiVersion: catalog.kubedb.com/v1alpha1
kind: MemcachedVersion
metadata:
name: "1.5.4-v1"
name: "1.6.22"
labels:
app: kubedb
spec:
version: "1.5.4"
db:
image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4-v1"
image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.6.22"
exporter:
image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1"
podSecurityPolicies:
Expand All @@ -59,7 +59,7 @@ We modify original Memcached docker image to support additional features. An ima

### spec.deprecated

`spec.deprecated` is an optional field that specifies whether the docker images specified here is supported by the current KubeDB operator. For example, we have modified `kubedb/memcached:1.5.4` docker image to support custom configuration and re-tagged as `kubedb/memcached:1.5.4-v1`. Now, KubeDB `0.9.0-rc.0` supports providing custom configuration which required `kubedb/memcached:1.5.4-v1` docker image. So, we have marked `kubedb/memcached:1.5.4` as deprecated for KubeDB `0.9.0-rc.0`.
`spec.deprecated` is an optional field that specifies whether the docker images specified here is supported by the current KubeDB operator. For example, we have modified `kubedb/memcached:1.5.4` docker image to support custom configuration and re-tagged as `kubedb/memcached:1.6.22`. Now, KubeDB `0.9.0-rc.0` supports providing custom configuration which required `kubedb/memcached:1.6.22` docker image. So, we have marked `kubedb/memcached:1.5.4` as deprecated for KubeDB `0.9.0-rc.0`.

The default value of this field is `false`. If `spec.deprecated` is set `true`, KubeDB operator will not create the database and other respective resources for this version.

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/memcached/concepts/memcached.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ KubeDB uses `PodDisruptionBudget` to ensure that majority of these replicas are

`spec.version` is a required field specifying the name of the [MemcachedVersion](/docs/guides/memcached/concepts/catalog.md) crd where the docker images are specified. Currently, when you install KubeDB, it creates the following `MemcachedVersion` resources,

- `1.5.4`, `1.5.4-v1`, `1.5`, `1.5-v1`
- `1.5.4`, `1.6.22`, `1.5`, `1.5-v1`

### spec.monitor

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/memcached/configuration/using-config-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ metadata:
namespace: demo
spec:
replicas: 1
version: "1.5.4-v1"
version: "1.6.22"
configSecret:
name: mc-configuration
podTemplate:
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/memcached/custom-rbac/using-custom-rbac.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
serviceAccountName: my-custom-serviceaccount
Expand Down Expand Up @@ -196,7 +196,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
serviceAccountName: my-custom-serviceaccount
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/memcached/monitoring/using-builtin-prometheus.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ metadata:
namespace: demo
spec:
replicas: 1
version: "1.5.4-v1"
version: "1.6.22"
terminationPolicy: WipeOut
podTemplate:
spec:
Expand Down Expand Up @@ -81,7 +81,7 @@ Now, wait for the database to go into `Running` state.
```bash
$ kubectl get mc -n demo builtin-prom-memcd
NAME VERSION STATUS AGE
builtin-prom-memcd 1.5.4-v1 Running 1m
builtin-prom-memcd 1.6.22 Running 1m
```

KubeDB will create a separate stats service with name `{Memcached crd name}-stats` for monitoring purpose.
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/memcached/monitoring/using-prometheus-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
terminationPolicy: WipeOut
podTemplate:
spec:
Expand Down Expand Up @@ -137,7 +137,7 @@ Now, wait for the database to go into `Running` state.
```bash
$ kubectl get mc -n demo coreos-prom-memcd
NAME VERSION STATUS AGE
coreos-prom-memcd 1.5.4-v1 Running 19s
coreos-prom-memcd 1.6.22 Running 19s
```

KubeDB will create a separate stats service with name `{Memcached crd name}-stats` for monitoring purpose.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ KubeDB operator supports using private Docker registry. This tutorial will show
1.5 1.5 kubedb/memcached:1.5 kubedb/operator:0.8.0 true
1.5-v1 1.5 kubedb/memcached:1.5-v1 kubedb/memcached-exporter:v0.4.1 <none>
1.5.4 1.5.4 kubedb/memcached:1.5.4 kubedb/operator:0.8.0 true
1.5.4-v1 1.5.4 kubedb/memcached:1.5.4-v1 kubedb/memcached-exporter:v0.4.1 <none>
1.6.22 1.5.4 kubedb/memcached:1.6.22 kubedb/memcached-exporter:v0.4.1 <none>
```

Docker hub repositories:
Expand Down Expand Up @@ -101,7 +101,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
resources:
Expand Down Expand Up @@ -136,7 +136,7 @@ memcd-pvt-reg-694d4d44df-tkqc4 1/1 Running 0 27s
$ kubectl get mc -n demo
NAME VERSION STATUS AGE
memcd-pvt-reg 1.5.4-v1 Running 59s
memcd-pvt-reg 1.6.22 Running 59s
```

## Cleaning up
Expand Down
10 changes: 5 additions & 5 deletions docs/guides/memcached/quickstart/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ NAME VERSION DB_IMAGE DEPRECATED AGE
1.5 1.5 kubedb/memcached:1.5 true 2h
1.5-v1 1.5 kubedb/memcached:1.5-v1 2h
1.5.4 1.5.4 kubedb/memcached:1.5.4 true 2h
1.5.4-v1 1.5.4 kubedb/memcached:1.5.4-v1 2h
1.6.22 1.5.4 kubedb/memcached:1.6.22 2h
```

## Create a Memcached server
Expand All @@ -64,7 +64,7 @@ metadata:
namespace: demo
spec:
replicas: 3
version: "1.5.4-v1"
version: "1.6.22"
podTemplate:
spec:
resources:
Expand Down Expand Up @@ -94,7 +94,7 @@ KubeDB operator watches for `Memcached` objects using Kubernetes api. When a `Me
```bash
$ kubectl get mc -n demo
NAME VERSION STATUS AGE
memcd-quickstart 1.5.4-v1 Running 2m
memcd-quickstart 1.6.22 Running 2m

$ kubectl dba describe mc -n demo memcd-quickstart
Name: memcd-quickstart
Expand Down Expand Up @@ -167,7 +167,7 @@ spec:
memory: 64Mi
replicas: 3
terminationPolicy: Delete
version: 1.5.4-v1
version: 1.6.22
status:
observedGeneration: 1$4210395375389091791
phase: Running
Expand Down Expand Up @@ -282,7 +282,7 @@ spec:
memory: 64Mi
replicas: 3
terminationPolicy: Halt
version: 1.5.4-v1
version: 1.6.22
status:
observedGeneration: 1$7678503742307285743
pausingTime: 2018-10-03T09:50:10Z
Expand Down

0 comments on commit 26418aa

Please sign in to comment.