Merge branch 'release/v1.23.2-7'

cbeyer42 · cesmarvin · commit 89c149b75cb9 · 2023-07-10T11:41:57.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.23.2-7] - 2023-07-10
+### Changed
+- [#78] replaced all references to myCloudogu with references to the cloudogu platform
+
 ## [v1.23.2-6] - 2023-05-05
 ### Fixed
 - [#76] redirect errors to stderr and accesses to stdout again
diff --git a/Dockerfile b/Dockerfile
@@ -7,8 +7,8 @@ ENV NGINX_VERSION=1.23.2 \
     NGINX_TAR_SHA256="a80cc272d3d72aaee70aa8b517b4862a635c0256790434dbfc4d618a999b0b46" \
     CES_CONFD_VERSION=0.8.0 \
     CES_CONFD_TAR_SHA256="365a4033e80af6953d5b6513296a828dfd772a6640533bb51dd9abd34a1e53e8" \
-    WARP_MENU_VERSION=1.7.2 \
-    WARP_MENU_TAR_SHA256="0f89f3a4bcd24779b792bab34e77c60e27b9142c402e168013711f3094045726" \
+    WARP_MENU_VERSION=1.7.3 \
+    WARP_MENU_TAR_SHA256="b3ed4b50b1b9a739a4430d88975b5e3030c5e542c0739ed6b72d7eb8fd9a7b18" \
     CES_ABOUT_VERSION=0.2.2 \
     CES_ABOUT_TAR_SHA256="9926649be62d8d4667b2e7e6d1e3a00ebec1c4bbc5b80a0e830f7be21219d496" \
     CES_THEME_VERSION=0.7.0 \
@@ -59,7 +59,7 @@ RUN wget --progress=bar:force:noscroll -O /tmp/theme.zip https://github.com/clou
 FROM registry.cloudogu.com/official/base:3.17.3-2
 LABEL maintainer="hello@cloudogu.com" \
       NAME="official/nginx" \
-      VERSION="1.23.2-6"
+      VERSION="1.23.2-7"
 
 ENV CES_MAINTENANCE_MODE=false
 
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -132,5 +132,5 @@ void setIntegrationTestKeys(ecoSystem){
   ecoSystem.vagrant.ssh "sudo cp /dogu/integrationTests/privacy_policies.html /var/lib/ces/nginx/volumes/customhtml/"
   ecoSystem.vagrant.ssh '''etcdctl set config/nginx/externals/privacy_policies '{\\"DisplayName\\":\\"Privacy Policies\\",\\"Description\\":\\"Contains information about the privacy policies enforced by our company\\",\\"Category\\":\\"Information\\",\\"URL\\":\\"/static/privacy_policies.html\\"}' '''
   // etcd key for support entries
-  ecoSystem.vagrant.ssh '''etcdctl set /config/_global/disabled_warpmenu_support_entries '[\\"myCloudogu\\", \\"aboutCloudoguToken\\"]' '''
+  ecoSystem.vagrant.ssh '''etcdctl set /config/_global/disabled_warpmenu_support_entries '[\\"platform\\", \\"aboutCloudoguToken\\"]' '''
 }
diff --git a/Makefile b/Makefile
@@ -1,7 +1,28 @@
-MAKEFILES_VERSION=7.5.0
+MAKEFILES_VERSION=7.8.0
 
 .DEFAULT_GOAL:=dogu-release
 
 include build/make/variables.mk
 include build/make/self-update.mk
 include build/make/release.mk
+include build/make/version-sha.mk
+
+NGINX_VERSION=$(shell grep NGINX_VERSION= Dockerfile | sed 's/.*NGINX_VERSION=\([^ ]*\).*/\1/g')
+CES_CONFD_VERSION=$(shell grep CES_CONFD_VERSION= Dockerfile | sed 's/.*CES_CONFD_VERSION=\([^ ]*\).*/\1/g')
+WARP_MENU_VERSION=$(shell grep WARP_MENU_VERSION= Dockerfile | sed 's/.*WARP_MENU_VERSION=\([^ ]*\).*/\1/g')
+CES_ABOUT_VERSION=$(shell grep CES_ABOUT_VERSION= Dockerfile | sed 's/.*CES_ABOUT_VERSION=\([^ ]*\).*/\1/g')
+CES_THEME_VERSION=$(shell grep CES_THEME_VERSION= Dockerfile | sed 's/.*CES_THEME_VERSION=\([^ ]*\).*/\1/g')
+
+
+.PHONY: sums
+sums: ## Print out all versions
+	@echo "nginx"
+	@make --no-print-directory sha-sum SHA_SUM_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
+	@echo "confd"
+	@make --no-print-directory sha-sum SHA_SUM_URL=https://github.com/cloudogu/ces-confd/releases/download/v${CES_CONFD_VERSION}/ces-confd-${CES_CONFD_VERSION}.tar.gz
+	@echo "warp-menu"
+	@make --no-print-directory sha-sum SHA_SUM_URL=https://github.com/cloudogu/warp-menu/releases/download/v${WARP_MENU_VERSION}/warp-v${WARP_MENU_VERSION}.zip
+	@echo "ces-about"
+	@make --no-print-directory sha-sum SHA_SUM_URL=https://github.com/cloudogu/ces-about/releases/download/v${CES_ABOUT_VERSION}/ces-about-v${CES_ABOUT_VERSION}.tar.gz
+	@echo "ces-theme"
+	@make --no-print-directory sha-sum SHA_SUM_URL=https://github.com/cloudogu/ces-theme/archive/v${CES_THEME_VERSION}.zip
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ The Cloudogu EcoSystem is an open platform, which lets you choose how and where
 Want to talk to the Cloudogu team? Need help or support? There are several ways to get in touch with us:
 
 * [Website](https://cloudogu.com)
-* [myCloudogu-Forum](https://forum.cloudogu.com/topic/34?ctx=1)
+* [Community-Forum](https://community.cloudogu.com/)
 * [Email hello@cloudogu.com](mailto:hello@cloudogu.com)
 
 ---
diff --git a/build/make/k8s-dogu.mk b/build/make/k8s-dogu.mk
@@ -6,7 +6,7 @@ DOGU_JSON_DEV_FILE=${TARGET_DIR}/dogu.json
 ARTIFACT_ID=$(shell $(BINARY_YQ) -e ".Name" $(DOGU_JSON_FILE) | sed "s|.*/||g")
 # Namespace of the dogu is extracted from the dogu.json
 ARTIFACT_NAMESPACE=$(shell $(BINARY_YQ) -e ".Name" $(DOGU_JSON_FILE) | sed "s|/.*||g")
-# Namespace of the dogu is extracted from the dogu.json
+# Version of the dogu is extracted from the dogu.json
 VERSION=$(shell $(BINARY_YQ) -e ".Version" $(DOGU_JSON_FILE))
 # Image of the dogu is extracted from the dogu.json
 IMAGE=$(shell $(BINARY_YQ) -e ".Image" $(DOGU_JSON_FILE)):$(VERSION)
diff --git a/build/make/k8s.mk b/build/make/k8s.mk
@@ -7,6 +7,8 @@ endif
 ## Variables
 
 BINARY_YQ = $(UTILITY_BIN_PATH)/yq
+BINARY_HELM = $(UTILITY_BIN_PATH)/helm
+BINARY_HELMIFY = $(UTILITY_BIN_PATH)/helmify
 
 # The productive tag of the image
 IMAGE ?=
@@ -19,6 +21,8 @@ K3CES_REGISTRY_URL_PREFIX="${K3S_CLUSTER_FQDN}:${K3S_LOCAL_REGISTRY_PORT}"
 # the current namespace and the dev image.
 K8S_RESOURCE_TEMP_FOLDER ?= $(TARGET_DIR)/make/k8s
 K8S_RESOURCE_TEMP_YAML ?= $(K8S_RESOURCE_TEMP_FOLDER)/$(ARTIFACT_ID)_$(VERSION).yaml
+K8S_HELM_TARGET ?= $(K8S_RESOURCE_TEMP_FOLDER)/helm
+K8S_HELM_RESSOURCES ?= k8s/helm
 
 ##@ K8s - Variables
 
@@ -75,6 +79,45 @@ k8s-apply: k8s-generate $(K8S_POST_GENERATE_TARGETS) ## Applies all generated K8
 	@echo "Apply generated K8s resources..."
 	@kubectl apply -f $(K8S_RESOURCE_TEMP_YAML) --namespace=${NAMESPACE}
 
+##@ K8s - Helm
+
+${K8S_HELM_RESSOURCES}/Chart.yaml: ${BINARY_HELM} ## Creates the Chart.yaml-template if missing
+	@echo "Create Chart.yaml..."
+	@mkdir -p ${K8S_HELM_RESSOURCES}/tmp/
+	@${BINARY_HELM} create ${K8S_HELM_RESSOURCES}/tmp/${ARTIFACT_ID}
+	@cp ${K8S_HELM_RESSOURCES}/tmp/${ARTIFACT_ID}/Chart.yaml ${K8S_HELM_RESSOURCES}/
+	@rm -dr ${K8S_HELM_RESSOURCES}/tmp
+	@sed -i 's/appVersion: ".*"/appVersion: "0.0.0-replaceme"/' ${K8S_HELM_RESSOURCES}/Chart.yaml
+	@sed -i 's/version: .*/version: 0.0.0-replaceme/' ${K8S_HELM_RESSOURCES}/Chart.yaml
+
+.PHONY: k8s-helm-generate
+k8s-helm-generate: k8s-generate ${K8S_HELM_RESSOURCES}/Chart.yaml ${BINARY_HELMIFY} $(K8S_RESOURCE_TEMP_FOLDER) $(K8S_PRE_GENERATE_TARGETS) ## Generates the final helm chart.
+	@echo "Generate helm chart..."
+	@rm -drf ${K8S_HELM_TARGET}  # delete folder, so Chart.yaml is newly created from template
+	@mkdir -p ${K8S_HELM_TARGET}
+	@cat $(K8S_RESOURCE_TEMP_YAML) | ${BINARY_HELMIFY} ${K8S_HELM_TARGET}
+	@cp ${K8S_HELM_RESSOURCES}/Chart.yaml ${K8S_HELM_TARGET}
+	@sed -i 's/appVersion: "0.0.0-replaceme"/appVersion: "${VERSION}"/' ${K8S_HELM_TARGET}/Chart.yaml
+	@sed -i 's/version: 0.0.0-replaceme/version: ${HELM_CHART_VERSION}/' ${K8S_HELM_TARGET}/Chart.yaml
+
+.PHONY: k8s-helm-apply
+k8s-helm-apply: ${BINARY_HELM} image-import k8s-helm-generate $(K8S_POST_GENERATE_TARGETS) ## Generates and installs the helm chart.
+	@echo "Apply generated helm chart"
+	@${BINARY_HELM} upgrade -i ${ARTIFACT_ID} ${K8S_HELM_TARGET}
+
+.PHONY: k8s-helm-package
+k8s-helm-package: ${BINARY_HELM}  k8s-helm-generate $(K8S_POST_GENERATE_TARGETS) ## Generates and packages the helm chart.
+	@echo "Package generated helm chart"
+	@${BINARY_HELM} package ${K8S_HELM_TARGET} --app-version ${VERSION} -d ${K8S_HELM_TARGET}
+
+.PHONY: k8s-helm-delete
+k8s-helm-delete: ${BINARY_HELM} ## Uninstalls the current helm chart.
+	@echo "Uninstall helm chart"
+	@${BINARY_HELM} uninstall ${ARTIFACT_ID}
+
+.PHONY: k8s-helm-reinstall
+k8s-helm-reinstall: k8s-helm-delete k8s-helm-apply ## Uninstalls the current helm chart and reinstalls it.
+
 ##@ K8s - Docker
 
 .PHONY: docker-build
@@ -115,5 +158,11 @@ __check_defined = \
     $(if $(value $1),, \
       $(error Undefined $1$(if $2, ($2))))
 
-${BINARY_YQ}: $(UTILITY_BIN_PATH) ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(BINARY_YQ),github.com/mikefarah/yq/v4@v4.25.1)
+${BINARY_YQ}: $(UTILITY_BIN_PATH) ## Download yq locally if necessary.
+	$(call go-get-tool,$(BINARY_YQ),github.com/mikefarah/yq/v4@v4.25.1)
+
+${BINARY_HELM}: $(UTILITY_BIN_PATH) ## Download helm locally if necessary.
+	$(call go-get-tool,$(BINARY_HELM),helm.sh/helm/v3/cmd/helm@latest)
+
+${BINARY_HELMIFY}: $(UTILITY_BIN_PATH)  ## Download helmify locally if necessary.
+	$(call go-get-tool,$(BINARY_HELMIFY),github.com/arttor/helmify/cmd/helmify@latest)
diff --git a/build/make/version-sha.mk b/build/make/version-sha.mk
@@ -0,0 +1,18 @@
+##@ Version
+
+# This makefile is used to get the sha256sum of a specific github tag-src.tar.gz or .zip.
+# You may set any of the following variables before your make call to change the hash url.
+
+SHA_SUM_ORGANISATION?="cloudogu"
+SHA_SUM_REPOSITORY?="ecosystem"
+SHA_SUM_FILE_TYPE?="tar.gz"
+SHA_SUM_VERSION?="v20.04.4-2"
+SHA_SUM_URL?="https://github.com/${SHA_SUM_ORGANISATION}/${SHA_SUM_REPOSITORY}/archive/refs/tags/${SHA_SUM_VERSION}.${SHA_SUM_FILE_TYPE}"
+
+.PHONY: sha-sum
+sha-sum: ## Print out the version
+	@echo "Downloading from: ${SHA_SUM_URL}"
+	@wget -O - -o /dev/null "${SHA_SUM_URL}" > .download.for.hash \
+     || (echo "Could not be downloaded" && exit 1) \
+     && cat .download.for.hash | sha256sum
+	@rm -f .download.for.hash
diff --git a/docs/dev/integration_tests_de.md b/docs/dev/integration_tests_de.md
@@ -9,7 +9,7 @@ Außerdem muss der etcd Key `privacy_policies` gesetzt werden
 `etcdctl set config/nginx/externals/privacy_policies '{"DisplayName":"Privacy Policies","Description":"Contains information about the privacy policies enforced by our company","Category":"Information","URL":"/static/privacy_policies.html"}'`
 
 Anschließend muss noch der Key zum Entfernen bestimmter Links aus dem Warp-Menü gesetzt werden:
-`etcdctl set /config/_global/disabled_warpmenu_support_entries '["myCloudogu", "aboutCloudoguToken"]'`
+`etcdctl set /config/_global/disabled_warpmenu_support_entries '["platform", "aboutCloudoguToken"]'`
 
 Danach können die Tests mit:
 ```bash
diff --git a/docs/dev/integration_tests_en.md b/docs/dev/integration_tests_en.md
@@ -9,7 +9,7 @@ Also the etcd key `privacy_policies` must be set
 `etcdctl set config/nginx/externals/privacy_policies '{"DisplayName": "PrivacyPolicies", "Description": "Contains information about the privacy policies enforced by our company", "Category": "Information", "URL":"/static/privacy_policies.html"}'`.
 
 After that, the key to remove certain links from the warp menu must be set:
-`etcdctl set /config/_global/disabled_warpmenu_support_entries '["myCloudogu", "aboutCloudoguToken"]'`.
+`etcdctl set /config/_global/disabled_warpmenu_support_entries '["platform", "aboutCloudoguToken"]'`.
 
 After that the tests cann be run with:
 
diff --git a/docs/dev/support_entries_in_warp_menu_de.md b/docs/dev/support_entries_in_warp_menu_de.md
@@ -17,7 +17,7 @@ warp:
     - Bezeichner: aboutCloudoguToken
       extern: falsch
       href: /pfad/zu/intern/site
-    - Bezeichner: myCloudogu
+    - Bezeichner: platform
       extern: wahr
       href: https://path/to/extern/site.com
 ```
diff --git a/docs/dev/support_entries_in_warp_menu_en.md b/docs/dev/support_entries_in_warp_menu_en.md
@@ -17,7 +17,7 @@ warp:
     - identifier: aboutCloudoguToken
       external: false
       href: /pfad/to/intern/site
-    - identifier: myCloudogu
+    - identifier: platform
       external: true
       href: https://path/to/extern/site.com
 ```
diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/nginx",
-  "Version": "1.23.2-6",
+  "Version": "1.23.2-7",
   "DisplayName": "Nginx",
   "Description": "Nginx WebServer.",
   "Logo": "https://cloudogu.com/images/dogus/nginx.png",
diff --git a/integrationTests/cypress/integration/nginx_2_custom_support_entries.feature b/integrationTests/cypress/integration/nginx_2_custom_support_entries.feature
@@ -1,4 +1,4 @@
 Feature: display support entries
   Scenario: opening the warp menu when a etcd-key is set
     Given the warp menu is open
-    Then the warp menu category 'Support' contains a link to docs and no link to mycloudogu or the about page
+    Then the warp menu category 'Support' contains a link to docs and no link to platform or the about page
diff --git a/integrationTests/cypress/support/step_definitions/then.js b/integrationTests/cypress/support/step_definitions/then.js
@@ -17,7 +17,7 @@ Then("a static HTML custom page gets displayed", function () {
     cy.visit(Cypress.config().baseUrl + Cypress.env('customHTMLPath'));
 });
 
-Then(/^the warp menu category 'Support' contains a link to docs and no link to mycloudogu or the about page$/, function () {
+Then(/^the warp menu category 'Support' contains a link to docs and no link to platform or the about page$/, function () {
 
     cy.get('[id^=warpc][id$=support]').parent().children('ul').children().should('have.length', 1)
 
diff --git a/resources/etc/ces-confd/config.yaml.tpl b/resources/etc/ces-confd/config.yaml.tpl
@@ -15,9 +15,9 @@ warp:
       - identifier: aboutCloudoguToken
         external: false
         href: /info/about
-      - identifier: myCloudogu
+      - identifier: platform
         external: true
-        href: https://my.cloudogu.com/
+        href: https://platform.cloudogu.com
 
 service:
   source:

Original file line number	Diff line number	Diff line change
`@@ -132,5 +132,5 @@ void setIntegrationTestKeys(ecoSystem){`
`132`	`132`	`ecoSystem.vagrant.ssh "sudo cp /dogu/integrationTests/privacy_policies.html /var/lib/ces/nginx/volumes/customhtml/"`
`133`	`133`	`ecoSystem.vagrant.ssh '''etcdctl set config/nginx/externals/privacy_policies '{\\"DisplayName\\":\\"Privacy Policies\\",\\"Description\\":\\"Contains information about the privacy policies enforced by our company\\",\\"Category\\":\\"Information\\",\\"URL\\":\\"/static/privacy_policies.html\\"}' '''`
`134`	`134`	`// etcd key for support entries`
`135`		`- ecoSystem.vagrant.ssh '''etcdctl set /config/_global/disabled_warpmenu_support_entries '[\\"myCloudogu\\", \\"aboutCloudoguToken\\"]' '''`
	`135`	`+ ecoSystem.vagrant.ssh '''etcdctl set /config/_global/disabled_warpmenu_support_entries '[\\"platform\\", \\"aboutCloudoguToken\\"]' '''`
`136`	`136`	`}`