diff --git a/Makefile b/Makefile index ca6876c..1571c7d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -VERSION ?= v0.3.0 +VERSION ?= v0.3.1 # Default bundle image tag BUNDLE_IMG ?= controller-bundle:$(VERSION) # Options for 'bundle-build' @@ -22,7 +22,7 @@ UNDERMOON_IMG_VERSION ?= latest else IMG_NAME ?= undermoon-operator UNDERMOON_IMG_NAME ?= doyoubi/undermoon -UNDERMOON_IMG_VERSION ?= 0.6.0-buster +UNDERMOON_IMG_VERSION ?= 0.6.1-buster endif # Image URL to use all building/pushing image targets diff --git a/Makefile.utils b/Makefile.utils index 035abe8..edd39ff 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -1,5 +1,5 @@ OPERATOR_VERSION=$(VERSION) -OPERATOR_HELM_VERSION=0.3.0 +OPERATOR_HELM_VERSION=0.3.1 CHECKER_HELM_VERSION=0.1.0 TEST_K8S_VER="v1.18.2" diff --git a/README.md b/README.md index b1fd91b..d81bba9 100644 --- a/README.md +++ b/README.md @@ -7,31 +7,31 @@ using [operator-sdk](https://sdk.operatorframework.io/). ### Build Helm Charts ``` -> make build-helm +make build-helm ``` Then you can see the following packages in the current directory: -- undermoon-operator-0.3.0.tgz -- undermoon-cluster-0.3.0.tgz +- undermoon-operator-0.3.1.tgz +- undermoon-cluster-0.3.1.tgz ### Run the Operator Run the `undermoon-operator`: Note that you can change the name `my-undermoon-operator`. ``` -> helm install my-undermoon-operator undermoon-operator-0.3.0.tgz +helm install my-undermoon-operator undermoon-operator-0.3.1.tgz ``` ### Create an Undermoon Cluster Create an undermoon cluster by installing helm charts package: ``` -> helm install \ +helm install \ --set 'cluster.clusterName=my-cluster-name' \ --set 'cluster.chunkNumber=1' \ --set 'cluster.maxMemory=2048' \ --set 'cluster.port=5299' \ my-cluster \ -n my-namespace \ - undermoon-cluster-0.3.0.tgz + undermoon-cluster-0.3.1.tgz ``` Fields here: @@ -48,12 +48,12 @@ Fields here: Then you can access the service through `my-cluster:5299` inside the Kubernetes cluster: ``` # This can only be run inside the Kubernetes cluster. -> redis-cli -h my-cluster -p 5299 -c get mykey +redis-cli -h my-cluster.my-namespace.svc.cluster.local -p 5299 -c get mykey ``` ### Scale the Cluster ``` -> kubectl edit undermoon/my-cluster +kubectl edit undermoon/my-cluster # Change the `chunkNumber`, save, and exit. ``` Then the cluster will automatically scale the cluster. diff --git a/config/manager/overlays/test/kustomization.yaml b/config/manager/overlays/test/kustomization.yaml index fba804c..26106fa 100644 --- a/config/manager/overlays/test/kustomization.yaml +++ b/config/manager/overlays/test/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: controller newName: localhost:5000/undermoon-operator - newTag: v0.3.0 + newTag: v0.3.1 patchesJson6902: - target: diff --git a/helm/undermoon-cluster/Chart.yaml b/helm/undermoon-cluster/Chart.yaml index ac8429a..236d54b 100644 --- a/helm/undermoon-cluster/Chart.yaml +++ b/helm/undermoon-cluster/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0 +version: 0.3.1 maintainers: - name: doyoubi diff --git a/helm/undermoon-cluster/templates/NOTES.txt b/helm/undermoon-cluster/templates/NOTES.txt index 49778b0..ba49250 100644 --- a/helm/undermoon-cluster/templates/NOTES.txt +++ b/helm/undermoon-cluster/templates/NOTES.txt @@ -1,9 +1,6 @@ -1. Get the redis cluster address: -``` -kubectl get svc "{{ include "undermoon-cluster.public_storage_service_name" . }}" --namespace "{{ .Release.Namespace }}" -``` +1. Redis cluster address: -The port is {{ .Values.cluster.port }}. +{{ include "undermoon-cluster.public_storage_service_name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.cluster.port }} 2. Scaling the cluster Edit the undermoon resource: diff --git a/helm/undermoon-cluster/values.yaml b/helm/undermoon-cluster/values.yaml index 1182865..73c174f 100644 --- a/helm/undermoon-cluster/values.yaml +++ b/helm/undermoon-cluster/values.yaml @@ -15,10 +15,10 @@ cluster: image: undermoonImage: doyoubi/undermoon - undermoonImageTag: 0.6.0-buster + undermoonImageTag: 0.6.1-buster undermoonImagePullPolicy: IfNotPresent redisImage: redis - redisImageTag: 5.0.9 + redisImageTag: 5.0.14 resources: brokerResources: diff --git a/helm/undermoon-operator/Chart.yaml b/helm/undermoon-operator/Chart.yaml index 11f1134..0364c79 100644 --- a/helm/undermoon-operator/Chart.yaml +++ b/helm/undermoon-operator/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0 +version: 0.3.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # # This should be the same as the version of undermoon-operator. -appVersion: v0.3.0 +appVersion: v0.3.1 maintainers: - name: doyoubi diff --git a/helm/undermoon-operator/values.yaml b/helm/undermoon-operator/values.yaml index 3cbc68e..c838d96 100644 --- a/helm/undermoon-operator/values.yaml +++ b/helm/undermoon-operator/values.yaml @@ -4,7 +4,7 @@ image: operatorImage: doyoubi/undermoon-operator - operatorImageTag: v0.3.0 + operatorImageTag: v0.3.1 operatorImagePullPolicy: IfNotPresent broker_api_version: "v3"