Skip to content

Commit

Permalink
Merge pull request #2 from doyoubi/BumpVersion
Browse files Browse the repository at this point in the history
Bump operator version to v0.0.2. Bump helm chart version to 0.1.1
  • Loading branch information
doyoubi authored Sep 15, 2020
2 parents 3c4e09f + a59ef71 commit c0f7408
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Current Operator version
VERSION ?= 0.0.1
VERSION ?= v0.0.2
# Default bundle image tag
BUNDLE_IMG ?= controller-bundle:$(VERSION)
# Options for 'bundle-build'
Expand All @@ -22,7 +22,7 @@ UNDERMOON_IMG_VERSION ?= latest
else
IMG_NAME ?= undermoon-operator
UNDERMOON_IMG_NAME ?= undermoon
UNDERMOON_IMG_VERSION ?= 0.3.1
UNDERMOON_IMG_VERSION ?= 0.3.2
endif

# Image URL to use all building/pushing image targets
Expand Down
3 changes: 1 addition & 2 deletions Makefile.utils
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OPERATOR_VERSION=$(VERSION)
OPERATOR_HELM_VERSION=0.1.0
OPERATOR_HELM_VERSION=0.1.1
CHECKER_HELM_VERSION=0.1.0

TEST_K8S_VER="v1.18.2"
Expand All @@ -19,7 +19,6 @@ build-image:
$(MAKE) docker-push

build-helm:
$(MAKE) update-types
helm package helm/undermoon-operator
helm package helm/undermoon-cluster

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ using [operator-sdk](https://sdk.operatorframework.io/).
```

Then you can see the following packages in the current directory:
- undermoon-operator-0.1.0.tgz
- undermoon-cluster-0.1.0.tgz
- undermoon-operator-0.1.1.tgz
- undermoon-cluster-0.1.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.1.0.tgz
> helm install my-undermoon-operator undermoon-operator-0.1.1.tgz
```

### Create an Undermoon Cluster
Expand All @@ -29,7 +29,7 @@ Create an undermoon cluster by installing helm charts package:
--set 'cluster.chunkNumber=1' \
--set 'cluster.maxMemory=50' \
--set 'cluster.port=5299' \
undermoon-cluster-0.1.0.tgz
undermoon-cluster-0.1.1.tgz
```

Fields here:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/overlays/test/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resources:
images:
- name: controller
newName: localhost:5000/undermoon-operator
newTag: 0.0.1
newTag: v0.0.2

patchesJson6902:
- target:
Expand Down
2 changes: 1 addition & 1 deletion helm/undermoon-cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ 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.1.0
version: 0.1.1

2 changes: 1 addition & 1 deletion helm/undermoon-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cluster:

image:
undermoonImage: doyoubi/undermoon
undermoonImageTag: 0.3.1-buster
undermoonImageTag: 0.3.2-buster
undermoonImagePullPolicy: IfNotPresent
redisImage: redis
redisImageTag: 5.0.9
Expand Down
6 changes: 3 additions & 3 deletions helm/undermoon-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ 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.1.0
version: 0.1.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.
#
# For undermoon-operator, this should be the same as version/version.go
appVersion: 0.0.1
# This should be the same as the version of undermoon-operator.
appVersion: v0.0.2
2 changes: 1 addition & 1 deletion helm/undermoon-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
operatorImage: doyoubi/undermoon-operator
operatorImageTag: v0.0.1
operatorImageTag: v0.0.2
operatorImagePullPolicy: IfNotPresent

nameOverride: ""
Expand Down

0 comments on commit c0f7408

Please sign in to comment.