Skip to content

Commit

Permalink
Merge pull request #23 from sighupio/feat/support-k8s-1.30-1.31
Browse files Browse the repository at this point in the history 
feat: release v3.2.0
  • Loading branch information
@stefanoghinelli
stefanoghinelli authored Nov 4, 2024
2 parents 5bd52cd + 9f9a704 commit 8374b64
Show file tree
Hide file tree
Showing 19 changed files with 548 additions and 678 deletions.
959 changes: 354 additions & 605 deletions .drone.yml
View file

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,12 @@ Click on each package to see its full documentation.

| Kubernetes Version | Compatibility | Notes |
| ------------------ | :----------------: | --------------------------------------------------- |
| `1.22.x` | :white_check_mark: | Conformance tests passed. |
| `1.23.x` | :white_check_mark: | Conformance tests passed. |
| `1.24.x` | :white_check_mark: | Conformance tests passed. |
| `1.25.x` | :white_check_mark: | Conformance tests passed. |
| `1.26.x` | :white_check_mark: | Conformance tests passed. |
| `1.27.x` | :white_check_mark: | Conformance tests passed. |
| `1.28.x` | :white_check_mark: | Conformance tests passed. |
| `1.29.x` | :white_check_mark: | Conformance tests passed. |
| `1.30.x` | :white_check_mark: | Conformance tests passed. |
| `1.31.x` | :white_check_mark: | Conformance tests passed. |

Check the [compatibility matrix][compatibility-matrix] for additional information on previous releases of the module.
The table shows the latest 4 compatible versions. Check the [compatibility matrix][compatibility-matrix] for the complete list of all supported versions.

## Usage

Expand All @@ -56,7 +52,7 @@ All packages in this repository have the following dependencies, for package spe
```yaml
bases:
- name: registry/harbor
version: "v3.1.0"
version: "v3.2.0"
```
> See `furyctl` [documentation][furyctl-repo] for additional details about `Furyfile.yml` format.
Expand Down
31 changes: 18 additions & 13 deletions docs/COMPATIBILITY_MATRIX.md
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
# Compatibility Matrix

| Module Version / Kubernetes Version | 1.14.X | 1.15.X | 1.16.X | 1.17.X | 1.18.X | 1.19.X | 1.20.X | 1.21.X | 1.22.X | 1.23.X | 1.24.X | 1.25.X | 1.26.X | 1.27.X | 1.28.X | 1.29.X |
| ----------------------------------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
| v1.0.0 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | |
| v1.0.1 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | |
| v1.1.0 | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | |
| v1.1.1 | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | |
| v1.1.2 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | |
| v1.2.0 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | |
| v2.0.0 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | |
| v3.0.0 | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | |
| v3.0.1 | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | |
| v3.0.2 | | | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | |
| v3.1.0 | | | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
<!-- markdownlint-disable MD013 -->

| Module Version / Kubernetes Version | 1.14.X | 1.15.X | 1.16.X | 1.17.X | 1.18.X | 1.19.X | 1.20.X | 1.21.X | 1.22.X | 1.23.X | 1.24.X | 1.25.X | 1.26.X | 1.27.X | 1.28.X | 1.29.X | 1.30.X | 1.31.X |
| ----------------------------------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
| v1.0.0 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | | | |
| v1.0.1 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | | | |
| v1.1.0 | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | | | |
| v1.1.1 | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | | | |
| v1.1.2 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | | |
| v1.2.0 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | | | |
| v2.0.0 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | |
| v3.0.0 | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | |
| v3.0.1 | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | | | |
| v3.0.2 | | | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | | | | | |
| v3.1.0 | | | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | |
| v3.2.0 | | | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |

<!-- markdownlint-enable MD013 -->

- :white_check_mark: Compatible
- :warning: Has issues
Expand Down
11 changes: 11 additions & 0 deletions docs/releases/v3.2.0.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Registry Module version 3.2.0

## Changelog

- Added compatibility with Kubernetes versions 1.30.x and 1.31.x.

> NOTE: This release only extends the Kubernetes compatibility to versions 1.30 and 1.31. No functional changes are included, users can continue using their current version.
## Upgrade path

To upgrade this module from `v3.1.0` to `v3.2.0`, you need to download this new version, then apply the `kustomize` project. No further action is required.
2 changes: 1 addition & 1 deletion examples/external-db/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ configMapGenerator:
- POSTGRESQL_USERNAME=%YOUR_DB_USER%
- POSTGRESQL_DATABASE=registry
- POSTGRESQL_SSLMODE=disable
- EXT_ENDPOINT=https://harbor.%YOUR_DOMAIN%
- EXT_ENDPOINT=https://harbor.%YOUR_DOMAIN%:%YOUR_PORT%
- CLAIR_DB_HOST=%YOUR_DB_HOSTNAME%
- CLAIR_DB_PORT=%YOUR_DB_PORT%
- CLAIR_DB_USERNAME=%YOUR_DB_USER%
Expand Down
2 changes: 1 addition & 1 deletion examples/external-db/patch/ingress.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

- op: replace
path: /spec/tls/0/hosts/1
value: notary.%YOUR_DOMAIN%
value: notary.%YOUR_DOMAIN%:%YOUR_PORT%

- op: replace
path: "/metadata/annotations/cert-manager.io~1cluster-issuer"
Expand Down
2 changes: 1 addition & 1 deletion examples/external-db/secrets/notary/server.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"auth": {
"type": "token",
"options": {
"realm": "https://harbor.%YOUR_DOMAIN%/service/token",
"realm": "https://harbor.%YOUR_DOMAIN%:%YOUR_PORT%/service/token",
"service": "harbor-notary",
"issuer": "harbor-token-issuer",
"rootcertbundle": "/root.crt"
Expand Down
2 changes: 1 addition & 1 deletion examples/full-harbor/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ configMapGenerator:
- POSTGRESQL_USERNAME=postgres
- POSTGRESQL_DATABASE=registry
- POSTGRESQL_SSLMODE=disable
- EXT_ENDPOINT=https://harbor.%YOUR_DOMAIN%
- EXT_ENDPOINT=https://harbor.%YOUR_DOMAIN%:%YOUR_PORT%
- LOG_LEVEL=debug
- _REDIS_URL=redis:6379
- _REDIS_URL_REG=redis://redis:6379/2
Expand Down
2 changes: 1 addition & 1 deletion examples/full-harbor/secrets/notary/server.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"auth": {
"type": "token",
"options": {
"realm": "https://harbor.%YOUR_DOMAIN%/service/token",
"realm": "https://harbor.%YOUR_DOMAIN%:%YOUR_PORT%/service/token",
"service": "harbor-notary",
"issuer": "harbor-token-issuer",
"rootcertbundle": "/root.crt"
Expand Down
10 changes: 6 additions & 4 deletions katalog/harbor/MAINTENANCE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ All the following examples are tested in the pipeline

### e2e tests

[chartmuseum](../../katalog/tests/harbor/chartmuseum.sh)
[registry-notary](../../katalog/tests/harbor/registry-notary.sh)
[registry](../../katalog/tests/harbor/registry.sh)
[replication](../../katalog/tests/harbor/replication.sh)
- [setup](../../katalog/tests/harbor/setup.sh)
- [vulns](../../katalog/tests/harbor/vulns.sh)
- [chartmuseum](../../katalog/tests/harbor/chartmuseum.sh)
- [replication](../../katalog/tests/harbor/replication.sh)
- [registry](../../katalog/tests/harbor/registry.sh)
- [registry-notary](../../katalog/tests/harbor/registry-notary.sh)

### Dashboard and Rules

Expand Down
2 changes: 1 addition & 1 deletion katalog/harbor/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## What is Harbor?

> Harbor is an open-source container image registry that secures images with role-based access control, scans images
> for vulnerabilities, and signs images as trusted. As a CNCF Incubating project, Harbor delivers compliance,
> for vulnerabilities, and signs images as trusted. As a CNCF Graduated-level project, Harbor delivers compliance,
> performance, and interoperability to help you consistently and securely manage images across cloud-native compute
> platforms like Kubernetes and Docker.
Expand Down
30 changes: 19 additions & 11 deletions katalog/tests/harbor/chartmuseum.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,25 @@
load "./../lib/helper"

@test "[CHARTS] Setup" {
info
setup(){
helm repo add stable https://charts.helm.sh/stable
helm plugin install https://github.com/chartmuseum/helm-push
helm fetch stable/nginx-ingress --version 1.36.2
helm repo add --username=admin --password=Harbor12345 harbor-test https://harbor."${EXTERNAL_DNS}"/chartrepo/library --insecure-skip-tls-verify
}
run setup
[ "$status" -eq 0 ]
info
setup(){
echo "Adding stable repo" >&3
helm repo add stable https://charts.helm.sh/stable
echo "Installing helm-push plugin" >&3
helm plugin install https://github.com/chartmuseum/helm-push
echo "Fetching nginx-ingress" >&3
helm fetch stable/nginx-ingress --version 1.36.2
echo "Testing Harbor connection" >&3
curl -k -v https://harbor."${TEST_DOMAIN}":"${HTTPS_PORT}"/api/v2.0/health >&3
echo "Adding Harbor repo" >&3
helm repo add --username=admin --password=Harbor12345 harbor-test https://harbor."${TEST_DOMAIN}":"${HTTPS_PORT}"/chartrepo/library --insecure-skip-tls-verify
}
run setup
echo "Setup output: $output" >&3
[ "$status" -eq 0 ]
}


@test "[CHARTS] Push nginx ingress chart to Harbor" {
info
deploy(){
Expand All @@ -32,10 +40,10 @@ load "./../lib/helper"
@test "[CHARTS] Check nginx ingress is in chartmuseum" {
info
test(){
name=$(curl -k -s -X GET "https://harbor.${EXTERNAL_DNS}/api/v2.0/search?q=nginx-ingress" \
name=$(curl -k -s -X GET "https://harbor.${TEST_DOMAIN}:${HTTPS_PORT}/api/v2.0/search?q=nginx-ingress" \
-H "accept: application/json" \
--user "admin:Harbor12345" --fail | jq -r '.chart[0].Chart.name')
version=$(curl -k -s -X GET "https://harbor.${EXTERNAL_DNS}/api/v2.0/search?q=nginx-ingress" \
version=$(curl -k -s -X GET "https://harbor.${TEST_DOMAIN}:${HTTPS_PORT}/api/v2.0/search?q=nginx-ingress" \
-H "accept: application/json" \
--user "admin:Harbor12345" --fail | jq -r '.chart[0].Chart.version')
if [ "${name}" != "library/nginx-ingress" ]; then return 1; fi
Expand Down
0 katalog/tests/harbor/config/Furyfile.yml → katalog/tests/harbor/config/Furyfile.yaml
View file
File renamed without changes.
Loading

0 comments on commit 8374b64

Please sign in to comment.