Skip to content

Commit

Permalink
Hotfix/fix ssl template + release 1.26.1 (#129)
Browse files Browse the repository at this point in the history
* hotfix: fixing gotemplate to "not" remove spaces after the IF statement

* docs: add release doc for 1.26.1
  • Loading branch information
nutellinoit authored Sep 25, 2023
1 parent 591f78c commit 4d199ba
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 12 deletions.
17 changes: 9 additions & 8 deletions docs/COMPATIBILITY_MATRIX.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ For a complete list of all KFD releases and their compatibility with Kubernetes

| KFD / Kubernetes Version | v1.26.X | 1.25.X | 1.24.X | 1.23.X |
| ----------------------------------------------------------------------------- | ------------------ | ------------------ | ------------------ | ------------------ |
| [v1.26.1](https://github.com/sighupio/fury-distribution/releases/tag/v1.26.0) | :white_check_mark: | | | |
| [v1.26.0](https://github.com/sighupio/fury-distribution/releases/tag/v1.26.0) | :white_check_mark: | | | |
| [v1.25.7](https://github.com/sighupio/fury-distribution/releases/tag/v1.25.7) | | :white_check_mark: | | |
| [v1.25.6](https://github.com/sighupio/fury-distribution/releases/tag/v1.25.6) | | :white_check_mark: | | |
Expand All @@ -35,14 +36,14 @@ For a complete list of all KFD releases and their compatibility with Kubernetes

### Furyctl and KFD compatibility

| Furyctl / KFD | 1.26.0 | 1.25.7 | 1.25.6 | 1.25.5 | 1.25.4 | 1.25.3 | 1.25.2 |
| -------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ |
| 0.26.0 | :white_check_mark: | | | | | | |
| 0.25.2 | :warning: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| 0.25.1 | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| 0.25.0 | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| 0.25.0-beta.0 | | | | | | :white_check_mark: | |
| 0.25.0-alpha.1 | | | | | | | :white_check_mark: |
| Furyctl / KFD | 1.26.1 | 1.26.0 | 1.25.7 | 1.25.6 | 1.25.5 | 1.25.4 | 1.25.3 | 1.25.2 |
| -------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ |
| 0.26.0 | :white_check_mark: | :white_check_mark: | | | | | | |
| 0.25.2 | :warning: | :warning: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| 0.25.1 | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| 0.25.0 | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| 0.25.0-beta.0 | | | | | | | :white_check_mark: | |
| 0.25.0-alpha.1 | | | | | | | | :white_check_mark: |

See [Furyctl](https://github.com/sighupio/furyctl) repository for more informations on it's usage.

Expand Down
15 changes: 15 additions & 0 deletions docs/releases/v1.26.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Kubernetes Fury Distribution Release v1.26.0

Welcome to KFD release `v1.26.0`.

The distribution is maintained with ❤️ by the team [SIGHUP](https://sighup.io/) it is battle tested in production environments.

With this release, a single hotfix has been added

## New Features since `v1.26.1`

- Fix: gotemplate error on manual secrets for ingresses

## Upgrade procedure

Check the [v1.26.0-to-v1.26.1 upgrade guide](../upgrades/v1.26.0-to-v1.26.1.md) for the detailed procedure.
32 changes: 32 additions & 0 deletions docs/upgrades/v1.26.0-to-v1.26.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Kubernetes Fury Distribution v1.26.0 to 1.26.1 Upgrade Guide

This guide describes the steps to follow to upgrade the Kubernetes Fury Distribution (KFD) from v1.26.0 to 1.26.1.

If you are running a custom set of modules, or different versions than the ones included with each release of KFD, please refer to each module's release notes.

Notice that the guide will not cover changes related to the cloud provider, ingresses or pod placement changes. Only changes related to KFD and its modules.

> ⛔️ **IMPORTANT**
> we strongly recommend reading the whole guide before starting the upgrade process to identify possible blockers.
## Upgrade procedure

### 1. Using furyctl

Change `.spec.distributionVersion` on your `furyctl.yaml` file with the new `v1.26.1`.

Validate the schema using the new `v0.26.0` `furyctl` version:

```bash
furyctl validate config
```

Apply the new configuration on the cluster with:

```bash
furyctl create cluster
```

### 2. Using KFD directly

There are no changes on the modules since the version v1.26.0.
29 changes: 29 additions & 0 deletions releases/v1.26.1/Furyfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2022 SIGHUP s.r.l All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.

---
versions:
auth: v0.0.4
aws: v4.0.0
dr: v2.1.0
ingress: v2.1.0
logging: v3.2.0
monitoring: v2.2.0
opa: v1.9.0
networking: v1.14.0

bases:
- name: auth
- name: aws
- name: dr
- name: ingress
- name: logging
- name: monitoring
- name: networking
- name: opa

modules:
- name: aws
- name: dr
- name: ingress
40 changes: 40 additions & 0 deletions releases/v1.26.1/kfd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Copyright (c) 2017-present SIGHUP s.r.l All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.

version: v1.26.0
modules:
auth: v0.0.4
aws: v4.0.0
dr: v2.1.0
ingress: v2.1.0
logging: v3.2.0
monitoring: v2.2.0
opa: v1.9.0
networking: v1.14.0
kubernetes:
eks:
version: 1.26
installer: v2.0.1
furyctlSchemas:
eks:
- apiVersion: kfd.sighup.io/v1alpha2
kind: EKSCluster
kfddistribution:
- apiVersion: kfd.sighup.io/v1alpha2
kind: KFDDistribution
tools:
common:
furyagent:
version: 0.3.0
kubectl:
version: 1.26.7
kustomize:
version: 3.10.0
terraform:
version: 1.4.6
yq:
version: 4.34.1
eks:
awscli:
version: ">= 2.8.12"
45 changes: 45 additions & 0 deletions releases/v1.26.1/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright (c) 2017-present SIGHUP s.r.l All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.

---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# NB: This is a starting point for a kustomization.yaml file. It is not meant to be used in production as is.

resources:
# Networking
- ./vendor/katalog/networking/calico
# OPA
- ./vendor/katalog/opa/gatekeeper/core
- ./vendor/katalog/opa/gatekeeper/rules/templates
- ./vendor/katalog/opa/gatekeeper/rules/config
- ./vendor/katalog/opa/gatekeeper/gpm
# Monitoring
- ./vendor/katalog/monitoring/prometheus-operator
- ./vendor/katalog/monitoring/prometheus-operated
- ./vendor/katalog/monitoring/grafana
- ./vendor/katalog/monitoring/kubeadm-sm
- ./vendor/katalog/monitoring/kube-proxy-metrics
- ./vendor/katalog/monitoring/kube-state-metrics
- ./vendor/katalog/monitoring/node-exporter
- ./vendor/katalog/monitoring/prometheus-adapter
- ./vendor/katalog/monitoring/alertmanager-operated
# Logging
- ./vendor/katalog/logging/opensearch-single
- ./vendor/katalog/logging/opensearch-dashboards
- ./vendor/katalog/logging/cerebro
- ./vendor/katalog/logging/logging-operator
- ./vendor/katalog/logging/logging-operated
- ./vendor/katalog/logging/minio-ha
- ./vendor/katalog/logging/loki-distributed
- ./vendor/katalog/logging/configs
# Ingress
- ./vendor/katalog/ingress/cert-manager
- ./vendor/katalog/ingress/nginx
- ./vendor/katalog/ingress/forecastle
# DR
- ./vendor/katalog/dr/velero/velero-on-prem
- ./vendor/katalog/dr/velero/velero-schedules
- ./vendor/katalog/dr/velero/velero-restic
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ patchesJson6902:
path: /spec/template/spec/containers/0/args/-
value: "--dns01-recursive-nameservers=8.8.8.8:53,1.1.1.1:53"
{{- end }}
{{ if eq .spec.distribution.modules.ingress.nginx.tls.provider "secret" -}}
{{ if eq .spec.distribution.modules.ingress.nginx.tls.provider "secret" }}
patchesJson6902:
{{- if eq .spec.distribution.modules.ingress.nginx.type "dual" -}}
{{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
- target:
group: apps
version: v1
Expand All @@ -84,13 +84,13 @@ patchesJson6902:
name: nginx-ingress-controller-internal
namespace: ingress-nginx
path: patchesJson/ingress-nginx.yml
{{- else if eq .spec.distribution.modules.ingress.nginx.type "single" -}}
{{- else if eq .spec.distribution.modules.ingress.nginx.type "single" }}
- target:
group: apps
version: v1
kind: DaemonSet
name: nginx-ingress-controller
namespace: ingress-nginx
path: patchesJson/ingress-nginx.yml
{{- end -}}
{{- end }}
{{- end }}

0 comments on commit 4d199ba

Please sign in to comment.