Merge branch 'release/v1.1.0' into main

cloudogu · Sep 19, 2024 · 7d0fc1e · 7d0fc1e
2 parents 325eb10 + 4c6801d
commit 7d0fc1e
Show file tree

Hide file tree

Showing 8 changed files with 685 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.1.0] - 2024-09-19
+### Changed
+- Relicense to AGPL-3.0-only
+
 ## [v1.0.1] - 2024-06-10
 ### Changed
 - Throw error if the current deployment and the component target namespaces do not match

diff --git a/Dockerfile b/Dockerfile
@@ -35,7 +35,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="hello@cloudogu.com" \
       NAME="k8s-component-operator" \
-      VERSION="1.0.1"
+      VERSION="1.1.0"
 
 WORKDIR /
 COPY --from=builder /workspace/target/k8s-component-operator .

diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-component-operator
-VERSION=1.0.1
+VERSION=1.1.0
 ## Image URL to use all building/pushing image targets
 IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
 GOTAG?=1.22.0

diff --git a/README.md b/README.md
@@ -3,15 +3,20 @@ Cloudogu EcoSystem component operator for Kubernetes
 
 ---
 
-### What is the Cloudogu EcoSystem?
-The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry. We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus. The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [MIT License](https://cloudogu.com/license.html).
+## What is the Cloudogu EcoSystem?
+The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry.
 
-### How to get in touch?
-Want to talk to the Cloudogu team? Need help or support? There are several ways to get in touch with us:
+We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus Repository, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus.
+
+The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [AGPL-3.0-only](https://spdx.org/licenses/AGPL-3.0-only.html).
+
+## License
+Copyright © 2020 - present Cloudogu GmbH
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/.
+See [LICENSE](LICENSE) for details.
 
-* [Website](https://cloudogu.com)
-* [myCloudogu-Forum](https://forum.cloudogu.com/topic/34?ctx=1)
-* [Email hello@cloudogu.com](mailto:hello@cloudogu.com)
 
 ---
-&copy; 2023 Cloudogu GmbH - MADE WITH :heart:&nbsp;FOR DEV ADDICTS. [Legal notice / Impressum](https://cloudogu.com/imprint.html)
+MADE WITH :heart:&nbsp;FOR DEV ADDICTS. [Legal notice / Imprint](https://cloudogu.com/en/imprint/?mtm_campaign=ecosystem&mtm_kwd=imprint&mtm_source=github&mtm_medium=link)
diff --git a/k8s/helm/component-patch-tpl.yaml b/k8s/helm/component-patch-tpl.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 values:
   images:
-    componentOperator: cloudogu/k8s-component-operator:1.0.1
+    componentOperator: cloudogu/k8s-component-operator:1.1.0
     kubeRbacProxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
 patches:
   values.yaml:

diff --git a/k8s/helm/values.yaml b/k8s/helm/values.yaml
@@ -1,7 +1,7 @@
 manager:
   image:
     repository: cloudogu/k8s-component-operator
-    tag: 1.0.1
+    tag: 1.1.0
   imagePullPolicy: IfNotPresent
   env:
     logLevel: info

diff --git a/pkg/helm/client/Readme.md b/pkg/helm/client/Readme.md
@@ -2,7 +2,7 @@ The files in this directory were copied from https://github.com/mittwald/go-helm
 
 Their original contents are [licensed MIT and copyrighted by Mittwald CM Service](./LICENSE) except stated otherwise.
 
-Modifications are licensed MIT under the [root license of this repository](../../../LICENSE).
+Modifications are licensed AGPL-3.0-only under the [root license of this repository](../../../LICENSE).
 Modifications include:
 - support for plain http registries
 - usage of the client's `action.Config` when getting charts
@@ -12,4 +12,4 @@ Modifications include:
 - embedding the registry client into the helm client to act as a tag resolver
 - Moving example code to `example_test.go`
 - refactoring to improve testability
-- adding tests
+- adding tests