Skip to content

Commit

Permalink
Merge branch 'release/v1.0.1' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
nhinze23 authored and cesmarvin committed Mar 22, 2024
2 parents 58c4fa5 + 953c6e1 commit 3ee34b1
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v1.0.1] - 2024-03-22
### Fixed
- [#169] Fix dogu-operator-crd dependency version.

## [v1.0.0] - 2024-03-21

### Attention
- This release is broken due to an invalid helm dependency version for the `dogu-operator-crd`

### Added
- [#149] Clarified escaping rules for running the operator locally
(see [here](docs/development/development_guide_en.md) or [here](.env.template))
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN make compile-generic
FROM gcr.io/distroless/static:nonroot
LABEL maintainer="hello@cloudogu.com" \
NAME="k8s-dogu-operator" \
VERSION="1.0.0"
VERSION="1.0.1"

WORKDIR /
COPY --from=builder /workspace/target/k8s-dogu-operator .
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set these to the desired values
ARTIFACT_ID=k8s-dogu-operator
VERSION=1.0.0
VERSION=1.0.1

IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
GOTAG=1.21
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ appVersion: "0.0.0-replaceme"
annotations:
# Dependency for the Dogu-CRD.
# Allow all versions up to next major version to avoid breaking changes
"k8s.cloudogu.com/ces-dependency/k8s-dogu-operator-crd": "0.x.x-0"
"k8s.cloudogu.com/ces-dependency/k8s-dogu-operator-crd": "1.x.x-0"

# For k8s-etcd it is important to include "prerelease"-versions like "3.5.7-4", so there must be a "-0" after the patch-version.
# see https://helm.sh/docs/chart_best_practices/dependencies/#prerelease-versions for more information
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/component-patch-tpl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
values:
images:
doguOperator: cloudogu/k8s-dogu-operator:1.0.0
doguOperator: cloudogu/k8s-dogu-operator:1.0.1
kubeRbacProxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
chownInitImage: busybox:1.36
patches:
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ additionalImages:
controllerManager:
image:
repository: cloudogu/k8s-dogu-operator
tag: 1.0.0
tag: 1.0.1
imagePullPolicy: IfNotPresent
env:
logLevel: debug
Expand Down

0 comments on commit 3ee34b1

Please sign in to comment.