diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index 1a1a73af..7a1dacf3 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,7 +16,7 @@ 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: 0.15.0 +version: 0.15.1 # 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 diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index a6d596c3..b8fd1a25 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -118,7 +118,7 @@ spec: ingress: extraAnnotations: nginx.ingress.kubernetes.io/ssl-passthrough: "true" - hostname: {{ .Values.host | default (printf "%s.%s" .Release.Name $host) }}:443 + hostname: {{ .Values.host | default (printf "%s.%s" .Release.Name $host) }} className: "{{ $ingress }}" deployment: podAdditionalMetadata: diff --git a/packages/apps/versions_map b/packages/apps/versions_map index cd962870..3dc95bf1 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -44,7 +44,8 @@ kubernetes 0.12.1 28fca4e kubernetes 0.13.0 ced8e5b9 kubernetes 0.14.0 bfbde07c kubernetes 0.14.1 fde4bcfa -kubernetes 0.15.0 HEAD +kubernetes 0.15.0 cb7b8158 +kubernetes 0.15.1 HEAD mysql 0.1.0 f642698 mysql 0.2.0 8b975ff0 mysql 0.3.0 5ca8823 diff --git a/packages/system/kamaji/charts/kamaji/Chart.lock b/packages/system/kamaji/charts/kamaji/Chart.lock index de604948..285e5736 100644 --- a/packages/system/kamaji/charts/kamaji/Chart.lock +++ b/packages/system/kamaji/charts/kamaji/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: kamaji-etcd repository: https://clastix.github.io/charts - version: 0.8.0 -digest: sha256:525b0eb2b5bae709d62de9328312d42c54b5219c6df67061de0da79eeca04fb3 -generated: "2024-08-25T08:44:24.92211307+02:00" + version: 0.9.1 +digest: sha256:522ec6321e2e394bd89f88a59446b39d6871838c63583346fdca10db36f1bbdb +generated: "2025-02-17T09:27:31.011938073+03:00" diff --git a/packages/system/kamaji/images/kamaji/Dockerfile b/packages/system/kamaji/images/kamaji/Dockerfile index a5f2d2f5..00d9b7a8 100644 --- a/packages/system/kamaji/images/kamaji/Dockerfile +++ b/packages/system/kamaji/images/kamaji/Dockerfile @@ -1,7 +1,7 @@ # Build the manager binary FROM golang:1.23 as builder -ARG VERSION=edge-24.9.2 +ARG VERSION=edge-24.12.1 ARG TARGETOS TARGETARCH WORKDIR /workspace @@ -9,7 +9,7 @@ WORKDIR /workspace RUN curl -sSL https://github.com/clastix/kamaji/archive/refs/tags/${VERSION}.tar.gz | tar -xzvf- --strip=1 COPY patches /patches -RUN git apply /patches/disable-datastore-check.diff +RUN git apply /patches/*.diff RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build \ -ldflags "-X github.com/clastix/kamaji/internal.GitRepo=$GIT_REPO -X github.com/clastix/kamaji/internal.GitTag=$GIT_LAST_TAG -X github.com/clastix/kamaji/internal.GitCommit=$GIT_HEAD_COMMIT -X github.com/clastix/kamaji/internal.GitDirty=$GIT_MODIFIED -X github.com/clastix/kamaji/internal.BuildTime=$BUILD_DATE" \ diff --git a/scripts/installer.sh b/scripts/installer.sh index 5130fc3e..e3032145 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -3,7 +3,7 @@ set -o pipefail set -e BUNDLE=$(set -x; kubectl get configmap -n cozy-system cozystack -o 'go-template={{index .data "bundle-name"}}') -VERSION=9 +VERSION=10 run_migrations() { if ! kubectl get configmap -n cozy-system cozystack-version; then diff --git a/scripts/migrations/8 b/scripts/migrations/8 index bdff30cf..c7d7350c 100755 --- a/scripts/migrations/8 +++ b/scripts/migrations/8 @@ -1,5 +1,5 @@ #!/bin/sh -# Migration 7 --> 9 +# Migration 8 --> 9 if kubectl get clusterrolebinding kubeapps-admin-group; then kubectl delete clusterrolebinding kubeapps-admin-group diff --git a/scripts/migrations/9 b/scripts/migrations/9 new file mode 100755 index 00000000..cf6643af --- /dev/null +++ b/scripts/migrations/9 @@ -0,0 +1,10 @@ +#!/bin/sh +# Migration 9 --> 10 + +# Upgrade kubernetes.apps to new chart version +kubectl get kuberneteses.apps.cozystack.io -A --no-headers --output=custom-columns='NAMESPACE:.metadata.namespace,NAME:.metadata.name' | while read NAMESPACE NAME; do + kubectl patch kuberneteses.apps.cozystack.io -n "$NAMESPACE" "$NAME" --type merge -p '{"appVersion":"0.15.1"}' +done + +# Write version to cozystack-version config +kubectl create configmap -n cozy-system cozystack-version --from-literal=version=10 --dry-run=client -o yaml | kubectl apply -f-