Merge pull request #37 from Al-assad/dev_main

Improve makefile: docker, kustomize, helm package build publish tasks
linsoss · Dec 20, 2023 · 746030e · 746030e
2 parents a4c9b7f + 22a2038
commit 746030e
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -168,15 +168,25 @@ $(ENVTEST): $(LOCALBIN)
 
 ##@ Generate deployment resources under /deploy
 
+# doris-operator version
+OPR_VER ?=
+
 # Generate deploy/kustomize
 .PHONY: gen-deploy-kustomize
-gen-deploy-kustomize: manifests kustomize
+gen-deploy-kustomize: __check_opr_ver manifests kustomize
+	sed -i '' "s/newTag:.*/newTag: $(OPR_VER)/g" deploy/kustomize/kustomization.yaml
 	$(KUSTOMIZE) build config/crd > deploy/kustomize/crds.yaml
 	$(KUSTOMIZE) build config/rbac > deploy/kustomize/rbac.yaml
 	$(KUSTOMIZE) build config/manager > deploy/kustomize/manager.yaml
 	cp config/default/manager_auth_proxy_patch.yaml deploy/kustomize/manager_auth_proxy.yaml
 	$(KUSTOMIZE) build deploy/kustomize > deploy/kustomize/kustomized.yaml
 
+__check_opr_ver:
+	@if [ -z "$(OPR_VER)" ]; then \
+		echo "ERROR: OPR_VER(doris operator version) is not specified."; \
+		exit 1; \
+	fi
+
 
 HELMIFY ?= $(LOCALBIN)/helmify
 
@@ -192,12 +202,59 @@ init-deploy-helm: manifests kustomize helmify
 
 # Generate Helm chart from Kustomize
 .PHONY: gen-deploy-helm
-gen-deploy-helm: manifests kustomize helmify
+gen-deploy-helm: __check_opr_ver manifests kustomize helmify
+	sed -i '' "s/image: ghcr\.io\/linsoss\/doris-operator:.*/image: ghcr\.io\/linsoss\/doris-operator:$(OPR_VER)/g" deploy/helm/doris-operator/values.yaml
+	sed -i '' "s/version:.*/version: $(OPR_VER)/g" deploy/helm/doris-operator/Chart.yaml
+	sed -i '' "s/appVersion:.*/appVersion: v$(OPR_VER)/g" deploy/helm/doris-operator/Chart.yaml
 	mkdir -p deploy/helm/tmp/
 	$(KUSTOMIZE) build config/default | $(HELMIFY) -crd-dir deploy/helm/tmp
 	rsync -a --delete deploy/helm/tmp/crds deploy/helm/doris-operator/
 	rm -rf deploy/helm/tmp
 
+##@ Publish packages, Need to log in to ghcr.io in advance:
+## docker login ghcr.io -u xxx -p xxx
+## helm registry login -u xxx -p xxx ghcr.io
+
+# Build and publish Doris component images
+.PHONY: publish-doris-img
+DORIS_VER ?=
+publish-doris-img:
+	@if [ -z "$(DORIS_VER)" ]; then \
+		echo "ERROR: DORIS_VER is not specified."; \
+		exit 1; \
+	fi
+	@echo "begin to publish doris:$(DORIS_VER) to ghcr.io"
+	docker buildx create --name doris-builder --use --platform linux/amd64,linux/arm64
+	@cd images && \
+		echo "building doris-fe:$(DORIS_VER)" && \
+		docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/linsoss/doris-fe:$(DORIS_VER) -f fe/Dockerfile . --push && \
+		echo "building doris-broker:$(DORIS_VER)" && \
+		docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/linsoss/doris-broker:$(DORIS_VER) -f broker/Dockerfile . --push $$ \
+		echo "building doris-be:$(DORIS_VER)" && \
+		docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/linsoss/doris-be:$(DORIS_VER) -f be/Dockerfile . --push && \
+		echo "building doris-cn:$(DORIS_VER)" && \
+		docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/linsoss/doris-cn:$(DORIS_VER) -f cn/Dockerfile . --push
+	docker buildx rm doris-builder
+
+
+# Build and publish Doris operator packages
+.PHONY: publish-operator
+OPR_VER ?=
+publish-operator: __check_opr_ver gen-deploy-kustomize gen-deploy-helm
+	@echo "build doris-operator:$(OPR_VER) image"
+	@$(MAKE) docker-buildx IMG=ghcr.io/linsoss/doris-operator:$(OPR_VER)
+	@echo "publish kustomize package"
+	flux push artifact oci://ghcr.io/linsoss/kustomize/doris-operator:$(OPR_VER) \
+      --path="./deploy/kustomize" \
+      --source="https://github.com/linsoss/doris-operator.git" \
+      --revision="$(git branch --show-current)@sha1:$(git rev-parse HEAD)"
+	@echo "publish helm package"
+	cd deploy/helm && \
+    	helm package --version $(OPR_VER) doris-operator && \
+    	helm push doris-operator-$(OPR_VER).tgz oci://ghcr.io/linsoss/helm && \
+    	rm -f doris-operator-$(OPR_VER).tgz
+
+
 ##@ Website development
 WEBSITE_DIR ?= website
 
@@ -220,4 +277,4 @@ website-dev: website-sync
 # Clean website build resources
 .PHONY: website-clean
 website-clean:
-	cd ${WEBSITE_DIR} && pnpm run clean
+	cd ${WEBSITE_DIR} && pnpm run clean
diff --git a/deploy/helm/doris-operator/Chart.yaml b/deploy/helm/doris-operator/Chart.yaml
@@ -13,9 +13,9 @@ 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: 1.0.3
+version: 1.0.4
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "v1.0.3"
+appVersion: v1.0.4
diff --git a/deploy/helm/doris-operator/crds/doriscluster-crd.yaml b/deploy/helm/doris-operator/crds/doriscluster-crd.yaml
@@ -392,6 +392,10 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                type: object
               be:
                 properties:
                   additionalContainers:
@@ -2172,6 +2176,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -4058,6 +4066,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -5921,6 +5933,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -7782,6 +7798,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:

diff --git a/deploy/helm/doris-operator/values.yaml b/deploy/helm/doris-operator/values.yaml
@@ -1,7 +1,7 @@
 # doris operator controller main container configuration
 manager:
   # controller container image
-  image: ghcr.io/linsoss/doris-operator:1.0.3
+  image: ghcr.io/linsoss/doris-operator:1.0.4
   # controller container resources
   resources: { }
 

diff --git a/deploy/kustomize/crds.yaml b/deploy/kustomize/crds.yaml
@@ -1081,6 +1081,10 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                type: object
               be:
                 properties:
                   additionalContainers:
@@ -2861,6 +2865,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -4747,6 +4755,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -6610,6 +6622,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -8471,6 +8487,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:

diff --git a/deploy/kustomize/kustomization.yaml b/deploy/kustomize/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 images:
   - name: controller
     newName: ghcr.io/linsoss/doris-operator
-    newTag: 1.0.3
+    newTag: 1.0.4
 
 namespace: doris-operator-system
 namePrefix: doris-operator-

diff --git a/deploy/kustomize/kustomized.yaml b/deploy/kustomize/kustomized.yaml
@@ -1094,6 +1094,10 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                type: object
               be:
                 properties:
                   additionalContainers:
@@ -2874,6 +2878,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -4760,6 +4768,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -6623,6 +6635,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -8484,6 +8500,10 @@ spec:
                             type: array
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   baseImage:
                     type: string
                   claims:
@@ -9898,7 +9918,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/linsoss/doris-operator:1.0.3
+        image: ghcr.io/linsoss/doris-operator:1.0.4
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/website/config/_default/params.yml b/website/config/_default/params.yml
@@ -1,7 +1,7 @@
 # last doris images version
 last_doris_image_version: "2.0.3"
 # last doris operator version
-last_doris_operator_version: "1.0.3"
+last_doris_operator_version: "1.0.4"
 
 
 # Images (@hyas/images)