Update change log and image tag for releasing 0.6.0 (#55)

CHANGES.md

@@ -2,6 +2,19 @@ Changes by Version
 ==================
 Release Notes.
 
+0.6.0
+------------------
+
+#### Features
+- Add the Satellite CRD, webhooks and controller
+
+#### Bugs
+- Update release images to set numeric user id 
+- Fix the satellite config not support number error
+
+#### Chores
+- Add stabilization windows feature in satellite HPA documentation
+
 0.5.0
 ------------------
 

adapter/Makefile

@@ -58,8 +58,9 @@ docker-push: ## Push docker image with the adapter.
 ##@ Deployment
 
 .PHONY: deploy
-deploy: kustomize ## Deploy ADAPTER controller to the K8s cluster specified in ~/.kube/config.
-	kustomize build config/ | kubectl apply -f -
+deploy: kustomize ## Deploy adapter controller to the K8s cluster specified in ~/.kube/config.
+	@echo "Deploy adapter"
+	-MOD=adapter DIR="./" IMG_PATH=namespaced/adapter IMG=metrics-adapter NEW_IMG=${ADAPTER_IMG} $(root_dir)/hack/deploy.sh d
 
 .PHONY: release-build
 release-build: ## Build binary for release

adapter/config/namespaced/adapter/kustomization.yaml

@@ -22,4 +22,4 @@ kind: Kustomization
 images:
 - name: metrics-adapter
   newName: apache/skywalking-swck
-  newTag: v0.4.0
+  newTag: v0.6.0

docs/release.md

@@ -6,6 +6,7 @@ This documentation guides the release manager to release the SkyWalking Cloud on
 
 1. Close(if finished, or move to next milestone otherwise) all issues in the current milestone from [skywalking-swck](https://github.com/apache/skywalking-swck/milestones) and [skywalking](https://github.com/apache/skywalking/milestones), create a new milestone if needed.
 2. Update [CHANGES.md](../CHANGES.md).
+3. Update image tags of adapter and operator.
 
 
 ## Add your GPG public key to Apache svn

hack/operator-deploy.sh → hack/deploy.sh

@@ -19,16 +19,23 @@
 set -u
 set -ex
 
-OUT_DIR=$(mktemp -d -t operator-deploy.XXXXXXXXXX) || { echo "Failed to create temp file"; exit 1; }
+MOD=${MOD:-operator}
+DIR=${DIR:-default}
+IMG_PATH=${IMG_PATH:-manager}
+IMG=${IMG:-controller}
+NEW_IMG=${NEW_IMG:-controller}
+
+OUT_DIR=$(mktemp -d -t ${MOD}-deploy.XXXXXXXXXX) || { echo "Failed to create temp file"; exit 1; }
 
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOTDIR="${SCRIPTPATH}/../operator"
+TOOLBIN=${SCRIPTPATH}/../bin
+ROOTDIR="${SCRIPTPATH}/../${MOD}"
 
 main() {
     [[ $1 -eq 0 ]] && frag="apply" || frag="delete --ignore-not-found=true"
     cp -Rvf "${ROOTDIR}"/config/* "${OUT_DIR}"/.
-    cd "${OUT_DIR}"/manager && kustomize edit set image controller=${OPERATOR_IMG}
-    kustomize build "${OUT_DIR}"/default | kubectl ${frag} -f -
+    cd "${OUT_DIR}"/${IMG_PATH} && ${TOOLBIN}/kustomize edit set image ${IMG}=${NEW_IMG}
+    ${TOOLBIN}/kustomize build "${OUT_DIR}"/${DIR} | kubectl ${frag} -f -
 }
 
 usage() {
@@ -37,8 +44,8 @@ Usage:
     ${0} -[duh]
 
 Parameters:
-    -d  Deploy operator
-    -u  Undeploy operator
+    -d  Deploy ${MOD}
+    -u  Undeploy ${MOD}
     -h  Show this help.
 EOF
 exit 1
@@ -68,4 +75,4 @@ ret=0
 parseCmdLine "$@"
 ret=$?
 [ $ret -ne 0 ] && exit $ret
-echo "Done deploy [$OPERATOR_IMG] (exit $ret)"
+echo "Done deploy [$NEW_IMG] (exit $ret)"

operator/Makefile

@@ -98,12 +98,12 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy operator controller to the K8s cluster specified in ~/.kube/config.
 	@echo "Deploy operator"
-	-$(root_dir)/hack/operator-deploy.sh d
+	-MOD=operator DIR=default IMG_PATH=manager IMG=controller NEW_IMG=${OPERATOR_IMG} $(root_dir)/hack/deploy.sh d
 
 .PHONY: undeploy
 undeploy: manifests ## Undeploy operator controller from the K8s cluster specified in ~/.kube/config.
 	@echo "Undeploy operator"
-	-$(root_dir)/hack/operator-deploy.sh u
+	-MOD=operator DIR=default IMG_PATH=manager IMG=controller NEW_IMG=${OPERATOR_IMG} $(root_dir)/hack/deploy.sh u
 
 ##@ Release
 

operator/config/manager/kustomization.yaml

@@ -30,4 +30,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: apache/skywalking-swck
-  newTag: v0.4.0
+  newTag: v0.6.0