Skip to content

Commit

Permalink
Merge pull request #148 from sighupio/prerelease-1.27
Browse files Browse the repository at this point in the history
Release 1.27.0
  • Loading branch information
nutellinoit authored Jan 3, 2024
2 parents 0e60dc2 + 4f53a50 commit d8545f8
Show file tree
Hide file tree
Showing 177 changed files with 11,229 additions and 10,233 deletions.
34 changes: 19 additions & 15 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ platform:

steps:
- name: license-check
image: quay.io/sighup/golang:1.20.4
image: quay.io/sighup/golang:1.21.5
pull: always
commands:
- make license-check

- name: schema-check
image: quay.io/sighup/golang:1.20.4
image: quay.io/sighup/golang:1.21.5
pull: always
commands:
- |-
cat schemas/public/ekscluster-kfd-v1alpha2.json | \
Expand Down Expand Up @@ -45,7 +47,8 @@ steps:
- schema-check

- name: lint-go
image: quay.io/sighup/golang:1.20.4
image: quay.io/sighup/golang:1.21.5
pull: always
commands:
- make lint-go
depends_on:
Expand Down Expand Up @@ -87,10 +90,10 @@ steps:
- render
commands:
# we use --ignore-deprecations because we don't want the CI to fail when the API has not been removed yet.
- /pluto detect distribution.yml --ignore-deprecations --target-versions=k8s=v1.26.0
- /pluto detect distribution.yml --ignore-deprecations --target-versions=k8s=v1.27.0

---
name: e2e-kubernetes-1.26
name: e2e-kubernetes-1.27
kind: pipeline
type: docker

Expand All @@ -116,17 +119,17 @@ trigger:

steps:
- name: init
image: quay.io/sighup/e2e-testing-drone-plugin:v1.26.4
image: quay.io/sighup/e2e-testing-drone-plugin:v2.0.0
pull: always
volumes:
- name: shared
path: /shared
depends_on: [clone]
settings:
action: custom-cluster-126
pipeline_id: cluster-126
action: custom-cluster-127
pipeline_id: cluster-127
local_kind_config_path: tests/config/kind-config-custom
cluster_version: "1.26.4"
cluster_version: "1.27.1"
instance_path: /shared
instance_size: 2-extra-large
aws_default_region:
Expand Down Expand Up @@ -159,7 +162,7 @@ steps:
commands:
- ls -la /shared/
- ls -la /shared/kube/
- export KUBECONFIG=/shared/kube/kubeconfig-126
- export KUBECONFIG=/shared/kube/kubeconfig-127
- bats -t tests/install.sh
- bats -t tests/networking.sh
- bats -t tests/monitoring.sh
Expand All @@ -170,12 +173,12 @@ steps:
- bats -t tests/schema.sh

- name: destroy
image: quay.io/sighup/e2e-testing-drone-plugin:v1.26.4
image: quay.io/sighup/e2e-testing-drone-plugin:v2.0.0
pull: always
depends_on: [e2e]
settings:
action: destroy
pipeline_id: cluster-126
pipeline_id: cluster-127
instance_size: 2-extra-large
aws_default_region:
from_secret: aws_region
Expand Down Expand Up @@ -210,7 +213,7 @@ kind: pipeline
type: docker

depends_on:
- e2e-kubernetes-1.26
- e2e-kubernetes-1.27

platform:
os: linux
Expand Down Expand Up @@ -266,8 +269,9 @@ steps:
files:
- fury-distribution-${DRONE_TAG}.yml
- kind-config-${DRONE_TAG}.yml
- Furyfile.yml
- Furyfile.yaml
- kustomization.yaml
- kfd.yaml
prerelease: true
overwrite: true
title: "Prerelease ${DRONE_TAG}"
Expand Down Expand Up @@ -295,7 +299,7 @@ steps:
files:
- fury-distribution-${DRONE_TAG}.yml
- kind-config-${DRONE_TAG}.yml
- Furyfile.yml
- Furyfile.yaml
- kustomization.yaml
- kfd.yaml
prerelease: false
Expand Down
29 changes: 28 additions & 1 deletion .rules/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ linters:
linters-settings:
decorder:
disable-init-func-first-check: false
depguard:
rules:
main:
# List of allowed packages.
allow:
- $gostd
- github.com/Al-Pragliola/go-version
- github.com/go-playground/validator/v10
- github.com/sighupio
# Packages that are not allowed where the value is a suggestion.
deny:
- pkg: "github.com/sirupsen/logrus"
desc: not allowed
- pkg: "github.com/pkg/errors"
desc: Should be replaced by standard lib errors package
errcheck:
check-type-assertions: true
check-blank: true
Expand All @@ -79,7 +94,7 @@ linters-settings:
capital: true
period: true
gofumpt:
lang-version: "1.20"
lang-version: "1.21"
extra-rules: true
goimports:
local-prefixes: github.com/sighupio
Expand All @@ -98,6 +113,18 @@ linters-settings:
nolintlint:
require-explanation: true
require-specific: true
tagalign:
align: true
sort: true
order:
- json
- yaml
- yml
- toml
- mapstructure
- binding
- validate
strict: true
revive:
enable-all-rules: true
rules:
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bats 1.9.0
drone 1.7.0
golang 1.20.4
golangci-lint 1.52.2
golang 1.21.5
golangci-lint 1.55.2
yq 4.33.3
jq 1.6
make 4.4.1
18 changes: 10 additions & 8 deletions Furyfile.yml → Furyfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

---
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
auth: v0.1.0
aws: v4.1.0
dr: v2.2.0
ingress: v2.2.0
logging: v3.3.1
monitoring: v3.0.1
opa: v1.11.0
networking: v1.15.0
tracing: v1.0.1

bases:
- name: auth
Expand All @@ -22,6 +23,7 @@ bases:
- name: monitoring
- name: networking
- name: opa
- name: tracing

modules:
- name: aws
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ license-check:
-ignore 'vendor/**' \
--check .

.PHONY: format-go fmt fumpt imports gci
.PHONY: format-go fmt fumpt imports gci formattag

format-go: fmt fumpt imports gci
format-go: fmt fumpt imports gci formattag

fmt:
@find . -name "*.go" -type f -not -path '*/vendor/*' \
Expand All @@ -41,6 +41,11 @@ gci:
| xargs -I {} sh -c 'echo "formatting imports for {}.." && \
gci write --skip-generated -s standard -s default -s "Prefix(github.com/sighupio)" {}'

formattag:
@find . -name "*.go" -type f -not -path '*/vendor/*' \
| sed 's/^\.\///g' \
| xargs -I {} sh -c 'formattag -file {}'

.PHONY: lint-go

lint-go:
Expand All @@ -54,6 +59,8 @@ tools-go:
@go install mvdan.cc/gofumpt@v0.5.0
@go install golang.org/x/tools/cmd/goimports@v0.9.3
@go install github.com/daixiang0/gci@v0.10.1
@go install github.com/momaek/formattag@v0.0.9
@go install github.com/santhosh-tekuri/jsonschema/cmd/jv@v5.3.0

.PHONY: generate-private-schema dump-go-models

Expand Down
29 changes: 16 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<p align="center">Kubernetes Fury Distribution (KFD) is a certified battle-tested Kubernetes distribution based purely on upstream Kubernetes.</p>
<!-- markdownlint-enable MD033 -->

[![Build Status](http://ci.sighup.io/api/badges/sighupio/fury-distribution/status.svg?ref=refs/tags/v1.26.3)](http://ci.sighup.io/sighupio/fury-distribution)
[![Release](https://img.shields.io/badge/release-v1.26.3-blue?label=FuryDistributionRelease)](https://github.com/sighupio/fury-distribution/releases/latest)
[![Build Status](http://ci.sighup.io/api/badges/sighupio/fury-distribution/status.svg?ref=refs/tags/v1.27.0)](http://ci.sighup.io/sighupio/fury-distribution)
[![Release](https://img.shields.io/badge/release-v1.27.0-blue?label=FuryDistributionRelease)](https://github.com/sighupio/fury-distribution/releases/latest)
[![Slack](https://img.shields.io/badge/slack-@kubernetes/fury-yellow.svg?logo=slack)](https://kubernetes.slack.com/archives/C0154HYTAQH)
[![License](https://img.shields.io/github/license/sighupio/fury-distribution)](https://github.com/sighupio/fury-distribution/blob/main/LICENSE)

Expand Down Expand Up @@ -59,6 +59,7 @@ Core modules provide essential functionality to the distribution for production-
| [Ingress][ingress-module] | ![Version][ingress-version] | Fast and reliable Ingress Controller and TLS certificate management |
| [Logging][logging-module] | ![Version][logging-version] | A centralized logging solution based on the OpenSearch stack |
| [Monitoring][monitoring-module] | ![Version][monitoring-version] | Monitoring and alerting functionality based on Prometheus, AlertManager and Grafana |
| [Tracing][tracing-module] | ![Version][tracing-version] | Tracing functionality based on Tempo |
| [Disaster Recovery][dr-module] | ![Version][dr-version] | Backup and disaster recovery solution using Velero |
| [OPA][opa-module] | ![Version][opa-version] | Policy and Governance for your cluster using OPA Gatekeeper and Gatekeeper Policy Manager |
| [Auth][auth-module] | ![Version][auth-version] | Improved auth for your Kubernetes Cluster and its applications |
Expand Down Expand Up @@ -95,9 +96,9 @@ Current supported versions of KFD are:

| KFD Version | Kubernetes Version |
| :----------------------------------------------------------------------------: | :----------------: |
| [`1.26.3`](https://github.com/sighupio/fury-distribution/releases/tag/v1.26.3) | `1.26.x` |
| [`1.25.8`](https://github.com/sighupio/fury-distribution/releases/tag/v1.25.8) | `1.25.x` |
| [`1.24.1`](https://github.com/sighupio/fury-distribution/releases/tag/v1.24.1) | `1.24.x` |
| [`1.27.0`](https://github.com/sighupio/fury-distribution/releases/tag/v1.26.4) | `1.27.x` |
| [`1.26.4`](https://github.com/sighupio/fury-distribution/releases/tag/v1.26.4) | `1.26.x` |
| [`1.25.9`](https://github.com/sighupio/fury-distribution/releases/tag/v1.25.9) | `1.25.x` |

Check the [compatibility matrix][compatibility-matrix] for additional information about previous releases of the Distribution and the compatibility with `furyctl`.

Expand All @@ -112,7 +113,7 @@ KFD has been certified by the [CNCF] (Cloud Native Computing Foundation) as a *C
<!-- markdownlint-disable MD033 -->
<p align="center">
<a href="https://github.com/cncf/k8s-conformance/pull/2771">
<img src="https://github.com/cncf/artwork/raw/master/projects/kubernetes/certified-kubernetes/versionless/pantone/certified-kubernetes-pantone.svg" width="120" alt="KFD is CNCF Certified Kubernetes 1.26 - click to see the certification PR"/>
<img src="https://raw.githubusercontent.com/cncf/artwork/main/projects/kubernetes/certified-kubernetes/versionless/pantone/certified-kubernetes-pantone.svg" width="120" alt="KFD is CNCF Certified Kubernetes 1.27 - click to see the certification PR"/>
</a>
</p>
<!-- markdownlint-enable MD033 -->
Expand All @@ -130,17 +131,19 @@ KFD is open-source software and it's released under the following [LICENSE](LICE
[ingress-module]: https://github.com/sighupio/fury-kubernetes-ingress
[logging-module]: https://github.com/sighupio/fury-kubernetes-logging
[monitoring-module]: https://github.com/sighupio/fury-kubernetes-monitoring
[tracing-module]: https://github.com/sighupio/fury-kubernetes-tracing
[dr-module]: https://github.com/sighupio/fury-kubernetes-dr
[opa-module]: https://github.com/sighupio/fury-kubernetes-opa
[auth-module]: https://github.com/sighupio/fury-kubernetes-auth

[networking-version]: https://img.shields.io/badge/release-v1.14.0-blue
[ingress-version]: https://img.shields.io/badge/release-v2.1.0-blue
[logging-version]: https://img.shields.io/badge/release-v3.2.0-blue
[monitoring-version]: https://img.shields.io/badge/release-v2.2.0-blue
[dr-version]: https://img.shields.io/badge/release-v2.1.0-blue
[opa-version]: https://img.shields.io/badge/release-v1.9.0-blue
[auth-version]: https://img.shields.io/badge/release-v0.0.4-blue
[networking-version]: https://img.shields.io/badge/release-v1.15.0-blue
[ingress-version]: https://img.shields.io/badge/release-v2.2.0-blue
[logging-version]: https://img.shields.io/badge/release-v3.3.1-blue
[monitoring-version]: https://img.shields.io/badge/release-v3.0.1-blue
[tracing-version]: https://img.shields.io/badge/release-v1.0.1-blue
[dr-version]: https://img.shields.io/badge/release-v2.2.0-blue
[opa-version]: https://img.shields.io/badge/release-v1.11.0-blue
[auth-version]: https://img.shields.io/badge/release-v0.1.0-blue

<!-- Addon Modules -->
[kong-module]: https://github.com/sighupio/fury-kubernetes-kong
Expand Down
Loading

0 comments on commit d8545f8

Please sign in to comment.