Merge pull request #392 from owncloud/drop-kubernetes-version-enforce…

…ment-and-support-1.28

drop Kubernetes version enforcment and test Kubernetes 1.18

.drone.star

@@ -2,11 +2,13 @@ config = {
     "branches": [
         "master",
     ],
-    # if this changes, also the kubeVersion in the Chart.yaml needs to be changed
+    # if this changes, also tested versions in need to be changed here:
+    # - Makefile
     "kubernetesVersions": [
         "1.25.0",
         "1.26.0",
         "1.27.0",
+        "1.28.0",
     ],
 }
 
@@ -118,15 +120,6 @@ def documentation(ctx):
                     "--output-file=docs/values-desc-table.adoc",
                 ],
             },
-            {
-                "name": "helm-docs-kube-versions-adoc",
-                "image": "jnorwood/helm-docs:v1.11.0",
-                "entrypoint": [
-                    "/usr/bin/helm-docs",
-                    "--template-files=charts/ocis/docs/templates/kube-versions.adoc.gotmpl",
-                    "--output-file=kube-versions.adoc",
-                ],
-            },
             {
                 "name": "gomplate-values-adoc",
                 "image": "hairyhenderson/gomplate:v3.11.5-alpine",

Makefile

@@ -8,24 +8,22 @@ all: docs lint api clean
 docs: $(HELM_DOCS) $(GOMPLATE)
 	$(HELM_DOCS) --template-files=README.md.gotmpl --output-file=README.md
 	$(HELM_DOCS) --log-level debug --template-files=charts/ocis/docs/templates/values-desc-table.adoc.gotmpl --output-file=docs/values-desc-table.adoc
-	$(HELM_DOCS) --log-level debug --template-files=charts/ocis/docs/templates/kube-versions.adoc.gotmpl --output-file=docs/kube-versions.adoc
 	$(GOMPLATE) --file=charts/ocis/docs/templates/values.adoc.yaml.gotmpl  --out=charts/ocis/docs/values.adoc.yaml
 
 .PHONY: clean
 clean:
 	@rm charts/ocis/ci/templated.yaml
 
-
 .PHONY: lint
 lint: $(KUBE_LINTER)
 	# TODO: use helm from bingo
 	helm lint charts/ocis
-	helm template --kube-version 1.27.0 charts/ocis -f 'charts/ocis/ci/values.yaml' > charts/ocis/ci/templated.yaml
+	helm template charts/ocis -f 'charts/ocis/ci/values.yaml' > charts/ocis/ci/templated.yaml
 	$(KUBE_LINTER) lint charts/ocis/ci/templated.yaml
 
 
 .PHONY: api
-api: api-1.25.0 api-1.26.0
+api: api-1.25.0 api-1.26.0 api-1.27.0 api-1.28.0
 
 .PHONY: api-1.25.0
 api-1.25.0: api-1.25.0-template api-1.25.0-kubeconform
@@ -49,6 +47,9 @@ api-1.26.0-template:
 api-1.26.0-kubeconform: $(KUBECONFORM)
 	$(KUBECONFORM) -kubernetes-version 1.26.0 -summary -strict charts/ocis/ci/templated.yaml
 
+.PHONY: api-1.27.0
+api-1.27.0: api-1.27.0-template api-1.27.0-kubeconform
+
 .PHONY: api-1.27.0-template
 api-1.27.0-template:
 	helm template --kube-version 1.27.0 charts/ocis -f 'charts/ocis/ci/values.yaml' > charts/ocis/ci/templated.yaml
@@ -57,6 +58,17 @@ api-1.27.0-template:
 api-1.27.0-kubeconform: $(KUBECONFORM)
 	$(KUBECONFORM) -kubernetes-version 1.27.0 -summary -strict charts/ocis/ci/templated.yaml
 
+.PHONY: api-1.28.0
+api-1.28.0: api-1.28.0-template api-1.28.0-kubeconform
+
+.PHONY: api-1.28.0-template
+api-1.28.0-template:
+	helm template --kube-version 1.28.0 charts/ocis -f 'charts/ocis/ci/values.yaml' > charts/ocis/ci/templated.yaml
+
+.PHONY: api-1.28.0-kubeconform
+api-1.28.0-kubeconform: $(KUBECONFORM)
+	$(KUBECONFORM) -kubernetes-version 1.28.0 -summary -strict charts/ocis/ci/templated.yaml
+
 .PHONY: tools-update
 tools-update: $(BINGO)
 	$(BINGO) get github.com/bwplotka/bingo@latest

charts/ocis/Chart.yaml

@@ -11,10 +11,7 @@ maintainers:
 type: application
 version: 0.5.0
 appVersion: 4.0.1
-# supported Kubernetes versions
-# should only contain non EOL versions from https://kubernetes.io/releases/patch-releases/#non-active-branch-history
-# if this changes, also kubernetesVersions in .drone.star needs to be changed
-kubeVersion: "~1.25.0-0 || ~1.26.0-0 || ~1.27.0-0 || ~1.28.0-0"
+kubeVersion: "" # please see https://doc.owncloud.com/ocis/next/deployment/container/orchestration/orchestration.html#get-the-chart for compatible Kubernetes versions
 sources:
   - https://github.com/owncloud/ocis-charts
   - https://github.com/owncloud/ocis