mirror of
https://github.com/outbackdingo/cozystack.git
synced 2026-02-05 08:17:59 +00:00
Compare commits
1 Commits
fix-versio
...
platform-d
| Author | SHA1 | Date | |
|---|---|---|---|
|
3d0caaab19 |
47
.github/workflows/pull-requests-release.yaml
vendored
47
.github/workflows/pull-requests-release.yaml
vendored
@@ -80,7 +80,6 @@ jobs:
|
|||||||
- name: Ensure maintenance branch release-X.Y
|
- name: Ensure maintenance branch release-X.Y
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v7
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GH_PAT }}
|
|
||||||
script: |
|
script: |
|
||||||
const tag = '${{ steps.get_tag.outputs.tag }}'; // e.g. v0.1.3 or v0.1.3-rc3
|
const tag = '${{ steps.get_tag.outputs.tag }}'; // e.g. v0.1.3 or v0.1.3-rc3
|
||||||
const match = tag.match(/^v(\d+)\.(\d+)\.\d+(?:[-\w\.]+)?$/);
|
const match = tag.match(/^v(\d+)\.(\d+)\.\d+(?:[-\w\.]+)?$/);
|
||||||
@@ -90,45 +89,21 @@ jobs:
|
|||||||
}
|
}
|
||||||
const line = `${match[1]}.${match[2]}`;
|
const line = `${match[1]}.${match[2]}`;
|
||||||
const branch = `release-${line}`;
|
const branch = `release-${line}`;
|
||||||
|
|
||||||
// Get main branch commit for the tag
|
|
||||||
const ref = await github.rest.git.getRef({
|
|
||||||
owner: context.repo.owner,
|
|
||||||
repo: context.repo.repo,
|
|
||||||
ref: `tags/${tag}`
|
|
||||||
});
|
|
||||||
|
|
||||||
const commitSha = ref.data.object.sha;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await github.rest.repos.getBranch({
|
await github.rest.repos.getBranch({
|
||||||
owner: context.repo.owner,
|
owner: context.repo.owner,
|
||||||
repo: context.repo.repo,
|
repo: context.repo.repo,
|
||||||
branch
|
branch
|
||||||
});
|
});
|
||||||
|
console.log(`Branch '${branch}' already exists`);
|
||||||
await github.rest.git.updateRef({
|
} catch (_) {
|
||||||
|
await github.rest.git.createRef({
|
||||||
owner: context.repo.owner,
|
owner: context.repo.owner,
|
||||||
repo: context.repo.repo,
|
repo: context.repo.repo,
|
||||||
ref: `heads/${branch}`,
|
ref: `refs/heads/${branch}`,
|
||||||
sha: commitSha,
|
sha: context.sha
|
||||||
force: true
|
|
||||||
});
|
});
|
||||||
console.log(`🔁 Force-updated '${branch}' to ${commitSha}`);
|
console.log(`✅ Branch '${branch}' created at ${context.sha}`);
|
||||||
} catch (err) {
|
|
||||||
if (err.status === 404) {
|
|
||||||
await github.rest.git.createRef({
|
|
||||||
owner: context.repo.owner,
|
|
||||||
repo: context.repo.repo,
|
|
||||||
ref: `refs/heads/${branch}`,
|
|
||||||
sha: commitSha
|
|
||||||
});
|
|
||||||
console.log(`✅ Created branch '${branch}' at ${commitSha}`);
|
|
||||||
} else {
|
|
||||||
console.error('Unexpected error --', err);
|
|
||||||
core.setFailed(`Unexpected error creating/updating branch: ${err.message}`);
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get the latest published release
|
# Get the latest published release
|
||||||
@@ -162,12 +137,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
const tag = '${{ steps.get_tag.outputs.tag }}'; // v0.31.5-rc.1
|
const tag = '${{ steps.get_tag.outputs.tag }}'; // v0.31.5-rc.1
|
||||||
const m = tag.match(/^v(\d+\.\d+\.\d+)(-(?:alpha|beta|rc)\.\d+)?$/);
|
const m = tag.match(/^v(\d+\.\d+\.\d+)(-rc\.\d+)?$/);
|
||||||
if (!m) {
|
if (!m) {
|
||||||
core.setFailed(`❌ tag '${tag}' must match 'vX.Y.Z' or 'vX.Y.Z-(alpha|beta|rc).N'`);
|
core.setFailed(`❌ tag '${tag}' must match 'vX.Y.Z' or 'vX.Y.Z-rc.N'`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const version = m[1] + (m[2] ?? ''); // 0.31.5-rc.1
|
const version = m[1] + (m[2] ?? ''); // 0.31.5‑rc.1
|
||||||
const isRc = Boolean(m[2]);
|
const isRc = Boolean(m[2]);
|
||||||
core.setOutput('is_rc', isRc);
|
core.setOutput('is_rc', isRc);
|
||||||
const outdated = '${{ steps.semver.outputs.comparison-result }}' === '<';
|
const outdated = '${{ steps.semver.outputs.comparison-result }}' === '<';
|
||||||
|
|||||||
21
.github/workflows/tags.yaml
vendored
21
.github/workflows/tags.yaml
vendored
@@ -3,10 +3,9 @@ name: Versioned Tag
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- 'v*.*.*' # vX.Y.Z
|
- 'v*.*.*' # vX.Y.Z
|
||||||
- 'v*.*.*-rc.*' # vX.Y.Z-rc.N
|
- 'v*.*.*-rc.*' # vX.Y.Z-rc.N
|
||||||
- 'v*.*.*-beta.*' # vX.Y.Z-beta.N
|
|
||||||
- 'v*.*.*-alpha.*' # vX.Y.Z-alpha.N
|
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: tags-${{ github.workflow }}-${{ github.ref }}
|
group: tags-${{ github.workflow }}-${{ github.ref }}
|
||||||
@@ -43,7 +42,7 @@ jobs:
|
|||||||
if: steps.check_release.outputs.skip == 'true'
|
if: steps.check_release.outputs.skip == 'true'
|
||||||
run: echo "Release already exists, skipping workflow."
|
run: echo "Release already exists, skipping workflow."
|
||||||
|
|
||||||
# Parse tag meta-data (rc?, maintenance line, etc.)
|
# Parse tag meta‑data (rc?, maintenance line, etc.)
|
||||||
- name: Parse tag
|
- name: Parse tag
|
||||||
if: steps.check_release.outputs.skip == 'false'
|
if: steps.check_release.outputs.skip == 'false'
|
||||||
id: tag
|
id: tag
|
||||||
@@ -51,12 +50,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
const ref = context.ref.replace('refs/tags/', ''); // e.g. v0.31.5-rc.1
|
const ref = context.ref.replace('refs/tags/', ''); // e.g. v0.31.5-rc.1
|
||||||
const m = ref.match(/^v(\d+\.\d+\.\d+)(-(?:alpha|beta|rc)\.\d+)?$/); // ['0.31.5', '-rc.1' | '-beta.1' | …]
|
const m = ref.match(/^v(\d+\.\d+\.\d+)(-rc\.\d+)?$/); // ['0.31.5', '-rc.1']
|
||||||
if (!m) {
|
if (!m) {
|
||||||
core.setFailed(`❌ tag '${ref}' must match 'vX.Y.Z' or 'vX.Y.Z-(alpha|beta|rc).N'`);
|
core.setFailed(`❌ tag '${ref}' must match 'vX.Y.Z' or 'vX.Y.Z-rc.N'`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const version = m[1] + (m[2] ?? ''); // 0.31.5-rc.1
|
const version = m[1] + (m[2] ?? ''); // 0.31.5‑rc.1
|
||||||
const isRc = Boolean(m[2]);
|
const isRc = Boolean(m[2]);
|
||||||
const [maj, min] = m[1].split('.');
|
const [maj, min] = m[1].split('.');
|
||||||
core.setOutput('tag', ref); // v0.31.5-rc.1
|
core.setOutput('tag', ref); // v0.31.5-rc.1
|
||||||
@@ -64,7 +63,7 @@ jobs:
|
|||||||
core.setOutput('is_rc', isRc); // true
|
core.setOutput('is_rc', isRc); // true
|
||||||
core.setOutput('line', `${maj}.${min}`); // 0.31
|
core.setOutput('line', `${maj}.${min}`); // 0.31
|
||||||
|
|
||||||
# Detect base branch (main or release-X.Y) the tag was pushed from
|
# Detect base branch (main or release‑X.Y) the tag was pushed from
|
||||||
- name: Get base branch
|
- name: Get base branch
|
||||||
if: steps.check_release.outputs.skip == 'false'
|
if: steps.check_release.outputs.skip == 'false'
|
||||||
id: get_base
|
id: get_base
|
||||||
@@ -169,7 +168,7 @@ jobs:
|
|||||||
});
|
});
|
||||||
console.log(`Draft release created for ${tag}`);
|
console.log(`Draft release created for ${tag}`);
|
||||||
} else {
|
} else {
|
||||||
console.log(`Re-using existing release ${tag}`);
|
console.log(`Re‑using existing release ${tag}`);
|
||||||
}
|
}
|
||||||
core.setOutput('upload_url', rel.upload_url);
|
core.setOutput('upload_url', rel.upload_url);
|
||||||
|
|
||||||
@@ -182,7 +181,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
# Create release-X.Y.Z branch and push (force-update)
|
# Create release‑X.Y.Z branch and push (force‑update)
|
||||||
- name: Create release branch
|
- name: Create release branch
|
||||||
if: steps.check_release.outputs.skip == 'false'
|
if: steps.check_release.outputs.skip == 'false'
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ repos:
|
|||||||
(cd "$dir" && make generate)
|
(cd "$dir" && make generate)
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
git diff --color=always | cat
|
|
||||||
'
|
'
|
||||||
language: script
|
language: script
|
||||||
files: ^.*$
|
files: ^.*$
|
||||||
|
|||||||
1
Makefile
1
Makefile
@@ -20,7 +20,6 @@ build: build-deps
|
|||||||
make -C packages/system/kubeovn image
|
make -C packages/system/kubeovn image
|
||||||
make -C packages/system/kubeovn-webhook image
|
make -C packages/system/kubeovn-webhook image
|
||||||
make -C packages/system/dashboard image
|
make -C packages/system/dashboard image
|
||||||
make -C packages/system/metallb image
|
|
||||||
make -C packages/system/kamaji image
|
make -C packages/system/kamaji image
|
||||||
make -C packages/system/bucket image
|
make -C packages/system/bucket image
|
||||||
make -C packages/core/testing image
|
make -C packages/core/testing image
|
||||||
|
|||||||
@@ -1,97 +0,0 @@
|
|||||||
This is the third release candidate for the upcoming Cozystack v0.31.0 release.
|
|
||||||
The release notes show changes accumulated since the release of previous version, Cozystack v0.30.0.
|
|
||||||
|
|
||||||
Cozystack 0.31.0 further advances GPU support, monitoring, and all-around convenience features.
|
|
||||||
|
|
||||||
## New Features and Changes
|
|
||||||
|
|
||||||
* [kubernetes] Introduce GPU support for tenant Kubernetes clusters. (@kvaps in https://github.com/cozystack/cozystack/pull/834)
|
|
||||||
* Add VerticalPodAutoscaler to a few more components:
|
|
||||||
* [kubernetes] Kubernetes clusters in user tenants. (@klinch0 in https://github.com/cozystack/cozystack/pull/806)
|
|
||||||
* [platform] Cozystack dashboard. (@klinch0 in https://github.com/cozystack/cozystack/pull/828)
|
|
||||||
* [platform] Cozystack etcd-operator (@klinch0 in https://github.com/cozystack/cozystack/pull/850)
|
|
||||||
* Introduce support for cross-architecture builds and Cozystack on ARM:
|
|
||||||
* [build] Refactor Makefiles introducing build variables. (@nbykov0 in https://github.com/cozystack/cozystack/pull/907)
|
|
||||||
* [build] Add support for multi-architecture and cross-platform image builds. (@nbykov0 in https://github.com/cozystack/cozystack/pull/932 and https://github.com/cozystack/cozystack/pull/970)
|
|
||||||
* [platform] Introduce a new controller to synchronize tenant HelmReleases and propagate configuration changes. (@klinch0 in https://github.com/cozystack/cozystack/pull/870)
|
|
||||||
* [platform] Introduce options `expose-services`, `expose-ingress` and `expose-external-ips` to the ingress service. (@kvaps in https://github.com/cozystack/cozystack/pull/929)
|
|
||||||
* [kubevirt] Enable exporting VMs. (@kvaps in https://github.com/cozystack/cozystack/pull/808)
|
|
||||||
* [kubevirt] Make KubeVirt's CPU allocation ratio configurable. (@lllamnyp in https://github.com/cozystack/cozystack/pull/905)
|
|
||||||
* [virtual-machine] Add support for various storages. (@kvaps in https://github.com/cozystack/cozystack/pull/974)
|
|
||||||
* [cozystack-controller] Record the IP address pool and storage class in Workload objects. (@lllamnyp in https://github.com/cozystack/cozystack/pull/831)
|
|
||||||
* [cilium] Enable Cilium Gateway API. (@zdenekjanda in https://github.com/cozystack/cozystack/pull/924)
|
|
||||||
* [cilium] Enable user-added parameters in a tenant cluster Cilium. (@lllamnyp in https://github.com/cozystack/cozystack/pull/917)
|
|
||||||
* [apps] Remove user-facing config of limits and requests. (@lllamnyp in https://github.com/cozystack/cozystack/pull/935)
|
|
||||||
* Update the Cozystack release policy to include long-lived release branches and start with release candidates. Update CI workflows and docs accordingly.
|
|
||||||
* Use release branches `release-X.Y` for gathering and releasing fixes after initial `vX.Y.0` release. (@kvaps in https://github.com/cozystack/cozystack/pull/816)
|
|
||||||
* Automatically create release branches after initial `vX.Y.0` release is published. (@kvaps in https://github.com/cozystack/cozystack/pull/886)
|
|
||||||
* Introduce Release Candidate versions. Automate patch backporting by applying patches from pull requests labeled `[backport]` to the current release branch. (@kvaps in https://github.com/cozystack/cozystack/pull/841 and https://github.com/cozystack/cozystack/pull/901, @nickvolynkin in https://github.com/cozystack/cozystack/pull/890)
|
|
||||||
* Support alpha and beta pre-releases. (@kvaps in https://github.com/cozystack/cozystack/pull/978)
|
|
||||||
* Commit changes in release pipelines under `github-actions <github-actions@github.com>`. (@kvaps in https://github.com/cozystack/cozystack/pull/823)
|
|
||||||
* Describe the Cozystack release workflow. (@NickVolynkin in https://github.com/cozystack/cozystack/pull/817 and https://github.com/cozystack/cozystack/pull/897)
|
|
||||||
|
|
||||||
## Fixes
|
|
||||||
|
|
||||||
* [virtual-machine] Add GPU names to the virtual machine specifications. (@kvaps in https://github.com/cozystack/cozystack/pull/862)
|
|
||||||
* [virtual-machine] Count Workload resources for pods by requests, not limits. Other improvements to VM resource tracking. (@lllamnyp in https://github.com/cozystack/cozystack/pull/904)
|
|
||||||
* [platform] Fix installing HelmReleases on initial setup. (@kvaps in https://github.com/cozystack/cozystack/pull/833)
|
|
||||||
* [platform] Migration scripts update Kubernetes ConfigMap with the current stack version for improved version tracking. (@klinch0 in https://github.com/cozystack/cozystack/pull/840)
|
|
||||||
* [platform] Reduce requested CPU and RAM for the `kamaji` provider. (@klinch0 in https://github.com/cozystack/cozystack/pull/825)
|
|
||||||
* [platform] Improve the reconciliation loop for the Cozystack system HelmReleases logic. (@klinch0 in https://github.com/cozystack/cozystack/pull/809 and https://github.com/cozystack/cozystack/pull/810, @kvaps in https://github.com/cozystack/cozystack/pull/811)
|
|
||||||
* [platform] Remove extra dependencies for the Piraeus operator. (@klinch0 in https://github.com/cozystack/cozystack/pull/856)
|
|
||||||
* [platform] Refactor dashboard values. (@kvaps in https://github.com/cozystack/cozystack/pull/928, patched by @llamnyp in https://github.com/cozystack/cozystack/pull/952)
|
|
||||||
* [platform] Make FluxCD artifact disabled by default. (@klinch0 in https://github.com/cozystack/cozystack/pull/964)
|
|
||||||
* [kubernetes] Update garbage collection of HelmReleases in tenant Kubernetes clusters. (@kvaps in https://github.com/cozystack/cozystack/pull/835)
|
|
||||||
* [kubernetes] Fix merging `valuesOverride` for tenant clusters. (@kvaps in https://github.com/cozystack/cozystack/pull/879)
|
|
||||||
* [kubernetes] Fix `ubuntu-container-disk` tag. (@kvaps in https://github.com/cozystack/cozystack/pull/887)
|
|
||||||
* [kubernetes] Refactor Helm manifests for tenant Kubernetes clusters. (@kvaps in https://github.com/cozystack/cozystack/pull/866)
|
|
||||||
* [kubernetes] Fix Ingress-NGINX depends on Cert-Manager . (@kvaps in https://github.com/cozystack/cozystack/pull/976)
|
|
||||||
* [tenant] Fix an issue with accessing external IPs of a cluster from the cluster itself. (@kvaps in https://github.com/cozystack/cozystack/pull/854)
|
|
||||||
* [cluster-api] Remove the no longer necessary workaround for Kamaji. (@kvaps in https://github.com/cozystack/cozystack/pull/867, patched in https://github.com/cozystack/cozystack/pull/956)
|
|
||||||
* [monitoring] Remove legacy label "POD" from the exclude filter in metrics. (@xy2 in https://github.com/cozystack/cozystack/pull/826)
|
|
||||||
* [monitoring] Refactor management etcd monitoring config. Introduce a migration script for updating monitoring resources (`kube-rbac-proxy` daemonset). (@lllamnyp in https://github.com/cozystack/cozystack/pull/799 and https://github.com/cozystack/cozystack/pull/830)
|
|
||||||
* [monitoring] Fix VerticalPodAutoscaler resource allocation for VMagent. (@klinch0 in https://github.com/cozystack/cozystack/pull/820)
|
|
||||||
* [postgres] Remove duplicated `template` entry from backup manifest. (@etoshutka in https://github.com/cozystack/cozystack/pull/872)
|
|
||||||
* [kube-ovn] Fix versions mapping in Makefile. (@kvaps in https://github.com/cozystack/cozystack/pull/883)
|
|
||||||
* [dx] Automatically detect version for migrations in the installer.sh. (@kvaps in https://github.com/cozystack/cozystack/pull/837)
|
|
||||||
* [e2e] Increase timeout durations for `capi` and `keycloak` to improve reliability during environment setup. (@kvaps in https://github.com/cozystack/cozystack/pull/858)
|
|
||||||
* [e2e] Fix `device_ownership_from_security_context` CRI. (@dtrdnk in https://github.com/cozystack/cozystack/pull/896)
|
|
||||||
* [e2e] Return `genisoimage` to the e2e-test Dockerfile (@gwynbleidd2106 in https://github.com/cozystack/cozystack/pull/962)
|
|
||||||
* [ci] Improve the check for `versions_map` running on pull requests. (@kvaps and @klinch0 in https://github.com/cozystack/cozystack/pull/836, https://github.com/cozystack/cozystack/pull/842, and https://github.com/cozystack/cozystack/pull/845)
|
|
||||||
* [ci] If the release step was skipped on a tag, skip tests as well. (@kvaps in https://github.com/cozystack/cozystack/pull/822)
|
|
||||||
* [ci] Allow CI to cancel the previous job if a new one is scheduled. (@kvaps in https://github.com/cozystack/cozystack/pull/873)
|
|
||||||
* [ci] Use the correct version name when uploading build assets to the release page. (@kvaps in https://github.com/cozystack/cozystack/pull/876)
|
|
||||||
* [ci] Stop using `ok-to-test` label to trigger CI in pull requests. (@kvaps in https://github.com/cozystack/cozystack/pull/875)
|
|
||||||
* [ci] Do not run tests in the release building pipeline. (@kvaps in https://github.com/cozystack/cozystack/pull/882)
|
|
||||||
* [ci] Fix release branch creation. (@kvaps in https://github.com/cozystack/cozystack/pull/884)
|
|
||||||
* [ci, dx] Reduce noise in the test logs by suppressing the `wget` progress bar. (@lllamnyp in https://github.com/cozystack/cozystack/pull/865)
|
|
||||||
* [ci] Revert "automatically trigger tests in releasing PR". (@kvaps in https://github.com/cozystack/cozystack/pull/900)
|
|
||||||
* [ci] Force-update release branch on tagged main commits . (@kvaps in https://github.com/cozystack/cozystack/pull/977)
|
|
||||||
* [docs] Explain that tenants cannot have dashes in the names. (@NickVolynkin in https://github.com/cozystack/cozystack/pull/980)
|
|
||||||
|
|
||||||
## Dependencies
|
|
||||||
|
|
||||||
* MetalLB s now included directly as a patched image based on version 0.14.9. (@lllamnyp in https://github.com/cozystack/cozystack/pull/945)
|
|
||||||
* Update Kubernetes to v1.32.4. (@kvaps in https://github.com/cozystack/cozystack/pull/949)
|
|
||||||
* Update Talos Linux to v1.10.1. (@kvaps in https://github.com/cozystack/cozystack/pull/931)
|
|
||||||
* Update Cilium to v1.17.3. (@kvaps in https://github.com/cozystack/cozystack/pull/848)
|
|
||||||
* Update LINSTOR to v1.31.0. (@kvaps in https://github.com/cozystack/cozystack/pull/846)
|
|
||||||
* Update Kube-OVN to v1.13.11. (@kvaps in https://github.com/cozystack/cozystack/pull/847, @lllamnyp in https://github.com/cozystack/cozystack/pull/922)
|
|
||||||
* Update tenant Kubernetes to v1.32. (@kvaps in https://github.com/cozystack/cozystack/pull/871)
|
|
||||||
* Update flux-operator to 0.20.0. (@kingdonb in https://github.com/cozystack/cozystack/pull/880 and https://github.com/cozystack/cozystack/pull/934)
|
|
||||||
* Update multiple Cluster API components. (@kvaps in https://github.com/cozystack/cozystack/pull/867 and https://github.com/cozystack/cozystack/pull/947)
|
|
||||||
* Update KamajiControlPlane to edge-25.4.1. (@kvaps in https://github.com/cozystack/cozystack/pull/953, fixed by @nbykov0 in https://github.com/cozystack/cozystack/pull/983)
|
|
||||||
* Update cert-manager to v1.17.2. (@kvaps in https://github.com/cozystack/cozystack/pull/975)
|
|
||||||
|
|
||||||
## Maintenance
|
|
||||||
|
|
||||||
* Add @klinch0 to CODEOWNERS. (@kvaps in https://github.com/cozystack/cozystack/pull/838)
|
|
||||||
|
|
||||||
## New Contributors
|
|
||||||
|
|
||||||
* @etoshutka made their first contribution in https://github.com/cozystack/cozystack/pull/872
|
|
||||||
* @dtrdnk made their first contribution in https://github.com/cozystack/cozystack/pull/896
|
|
||||||
* @zdenekjanda made their first contribution in https://github.com/cozystack/cozystack/pull/924
|
|
||||||
* @gwynbleidd2106 made their first contribution in https://github.com/cozystack/cozystack/pull/962
|
|
||||||
|
|
||||||
**Full Changelog**: https://github.com/cozystack/cozystack/compare/v0.30.0...v0.31.0-rc.3
|
|
||||||
117
hack/cozytest.sh
117
hack/cozytest.sh
@@ -1,117 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
###############################################################################
|
|
||||||
# cozytest.sh - Bats-compatible test runner with live trace and enhanced #
|
|
||||||
# output, written in pure shell #
|
|
||||||
###############################################################################
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
TEST_FILE=${1:?Usage: ./cozytest.sh <file.bats> [pattern]}
|
|
||||||
PATTERN=${2:-*}
|
|
||||||
LINE='----------------------------------------------------------------'
|
|
||||||
|
|
||||||
cols() { stty size 2>/dev/null | awk '{print $2}' || echo 80; }
|
|
||||||
MAXW=$(( $(cols) - 12 )); [ "$MAXW" -lt 40 ] && MAXW=70
|
|
||||||
BEGIN=$(date +%s)
|
|
||||||
timestamp() { s=$(( $(date +%s) - BEGIN )); printf '[%02d:%02d]' $((s/60)) $((s%60)); }
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# run_one <fn> <title> #
|
|
||||||
###############################################################################
|
|
||||||
run_one() {
|
|
||||||
fn=$1 title=$2
|
|
||||||
tmp=$(mktemp -d) || { echo "Failed to create temp directory" >&2; exit 1; }
|
|
||||||
log="$tmp/log"
|
|
||||||
|
|
||||||
echo "╭ » Run test: $title"
|
|
||||||
START=$(date +%s)
|
|
||||||
skip_next="+ $fn" # первую строку трассировки с именем функции пропустим
|
|
||||||
|
|
||||||
{
|
|
||||||
(
|
|
||||||
PS4='+ ' # prefix for set -x
|
|
||||||
set -eu -x # strict + trace
|
|
||||||
"$fn"
|
|
||||||
)
|
|
||||||
printf '__RC__%s\n' "$?"
|
|
||||||
} 2>&1 | tee "$log" | while IFS= read -r line; do
|
|
||||||
case "$line" in
|
|
||||||
'__RC__'*) : ;;
|
|
||||||
'+ '*) cmd=${line#'+ '}
|
|
||||||
[ "$cmd" = "${skip_next#+ }" ] && continue
|
|
||||||
case "$cmd" in
|
|
||||||
'set -e'|'set -x'|'set -u'|'return 0') continue ;;
|
|
||||||
esac
|
|
||||||
out=$cmd ;;
|
|
||||||
*) out=$line ;;
|
|
||||||
esac
|
|
||||||
now=$(( $(date +%s) - START ))
|
|
||||||
[ ${#out} -gt "$MAXW" ] && out="$(printf '%.*s…' "$MAXW" "$out")"
|
|
||||||
printf '┊[%02d:%02d] %s\n' $((now/60)) $((now%60)) "$out"
|
|
||||||
done
|
|
||||||
|
|
||||||
rc=$(awk '/^__RC__/ {print substr($0,7)}' "$log" | tail -n1)
|
|
||||||
[ -z "$rc" ] && rc=1
|
|
||||||
now=$(( $(date +%s) - START ))
|
|
||||||
|
|
||||||
if [ "$rc" -eq 0 ]; then
|
|
||||||
printf '╰[%02d:%02d] ✅ Test OK: %s\n' $((now/60)) $((now%60)) "$title"
|
|
||||||
else
|
|
||||||
printf '╰[%02d:%02d] ❌ Test failed: %s (exit %s)\n' \
|
|
||||||
$((now/60)) $((now%60)) "$title" "$rc"
|
|
||||||
echo "----- captured output -----------------------------------------"
|
|
||||||
grep -v '^__RC__' "$log"
|
|
||||||
echo "$LINE"
|
|
||||||
exit "$rc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf "$tmp"
|
|
||||||
}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# convert .bats -> shell-functions #
|
|
||||||
###############################################################################
|
|
||||||
TMP_SH=$(mktemp) || { echo "Failed to create temp file" >&2; exit 1; }
|
|
||||||
trap 'rm -f "$TMP_SH"' EXIT
|
|
||||||
awk '
|
|
||||||
/^@test[[:space:]]+"/ {
|
|
||||||
line = substr($0, index($0, "\"") + 1)
|
|
||||||
title = substr(line, 1, index(line, "\"") - 1)
|
|
||||||
fname = "test_"
|
|
||||||
for (i = 1; i <= length(title); i++) {
|
|
||||||
c = substr(title, i, 1)
|
|
||||||
fname = fname (c ~ /[A-Za-z0-9]/ ? c : "_")
|
|
||||||
}
|
|
||||||
printf("### %s\n", title)
|
|
||||||
printf("%s() {\n", fname)
|
|
||||||
print " set -e" # ошибка → падение теста
|
|
||||||
next
|
|
||||||
}
|
|
||||||
/^}$/ {
|
|
||||||
print " return 0" # если автор не сделал exit 1 — тест ОК
|
|
||||||
print "}"
|
|
||||||
next
|
|
||||||
}
|
|
||||||
{ print }
|
|
||||||
' "$TEST_FILE" > "$TMP_SH"
|
|
||||||
|
|
||||||
[ -f "$TMP_SH" ] || { echo "Failed to generate test functions" >&2; exit 1; }
|
|
||||||
# shellcheck disable=SC1090
|
|
||||||
. "$TMP_SH"
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# run selected tests #
|
|
||||||
###############################################################################
|
|
||||||
awk -v pat="$PATTERN" '
|
|
||||||
/^### / {
|
|
||||||
title = substr($0, 5)
|
|
||||||
name = "test_"
|
|
||||||
for (i = 1; i <= length(title); i++) {
|
|
||||||
c = substr(title, i, 1)
|
|
||||||
name = name (c ~ /[A-Za-z0-9]/ ? c : "_")
|
|
||||||
}
|
|
||||||
if (pat == "*" || index(title, pat) > 0)
|
|
||||||
printf("%s %s\n", name, title)
|
|
||||||
}
|
|
||||||
' "$TMP_SH" | while IFS=' ' read -r fn title; do
|
|
||||||
run_one "$fn" "$title"
|
|
||||||
done
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
#!/usr/bin/env bats
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
# Cozystack end‑to‑end provisioning test (Bats)
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@test "Create tenant with isolated mode enabled" {
|
|
||||||
kubectl create -f - <<EOF
|
|
||||||
apiVersion: apps.cozystack.io/v1alpha1
|
|
||||||
kind: Tenant
|
|
||||||
metadata:
|
|
||||||
name: test
|
|
||||||
namespace: tenant-root
|
|
||||||
spec:
|
|
||||||
etcd: false
|
|
||||||
host: ""
|
|
||||||
ingress: false
|
|
||||||
isolated: true
|
|
||||||
monitoring: false
|
|
||||||
resourceQuotas: {}
|
|
||||||
seaweedfs: false
|
|
||||||
EOF
|
|
||||||
kubectl wait hr/tenant-test -n tenant-root --timeout=1m --for=condition=ready
|
|
||||||
kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Create a tenant Kubernetes control plane" {
|
|
||||||
kubectl create -f - <<EOF
|
|
||||||
apiVersion: apps.cozystack.io/v1alpha1
|
|
||||||
kind: Kubernetes
|
|
||||||
metadata:
|
|
||||||
name: test
|
|
||||||
namespace: tenant-test
|
|
||||||
spec:
|
|
||||||
addons:
|
|
||||||
certManager:
|
|
||||||
enabled: false
|
|
||||||
valuesOverride: {}
|
|
||||||
cilium:
|
|
||||||
valuesOverride: {}
|
|
||||||
fluxcd:
|
|
||||||
enabled: false
|
|
||||||
valuesOverride: {}
|
|
||||||
gatewayAPI:
|
|
||||||
enabled: false
|
|
||||||
gpuOperator:
|
|
||||||
enabled: false
|
|
||||||
valuesOverride: {}
|
|
||||||
ingressNginx:
|
|
||||||
enabled: true
|
|
||||||
hosts: []
|
|
||||||
valuesOverride: {}
|
|
||||||
monitoringAgents:
|
|
||||||
enabled: false
|
|
||||||
valuesOverride: {}
|
|
||||||
verticalPodAutoscaler:
|
|
||||||
valuesOverride: {}
|
|
||||||
controlPlane:
|
|
||||||
apiServer:
|
|
||||||
resources: {}
|
|
||||||
resourcesPreset: small
|
|
||||||
controllerManager:
|
|
||||||
resources: {}
|
|
||||||
resourcesPreset: micro
|
|
||||||
konnectivity:
|
|
||||||
server:
|
|
||||||
resources: {}
|
|
||||||
resourcesPreset: micro
|
|
||||||
replicas: 2
|
|
||||||
scheduler:
|
|
||||||
resources: {}
|
|
||||||
resourcesPreset: micro
|
|
||||||
host: ""
|
|
||||||
nodeGroups:
|
|
||||||
md0:
|
|
||||||
ephemeralStorage: 20Gi
|
|
||||||
gpus: []
|
|
||||||
instanceType: u1.medium
|
|
||||||
maxReplicas: 10
|
|
||||||
minReplicas: 0
|
|
||||||
resources:
|
|
||||||
cpu: ""
|
|
||||||
memory: ""
|
|
||||||
roles:
|
|
||||||
- ingress-nginx
|
|
||||||
storageClass: replicated
|
|
||||||
EOF
|
|
||||||
kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
|
|
||||||
timeout 10 sh -ec 'until kubectl get kamajicontrolplane -n tenant-test kubernetes-test; do sleep 1; done'
|
|
||||||
kubectl wait --for=condition=TenantControlPlaneCreated kamajicontrolplane -n tenant-test kubernetes-test --timeout=4m
|
|
||||||
kubectl wait tcp -n tenant-test kubernetes-test --timeout=2m --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
|
|
||||||
kubectl wait deploy --timeout=4m --for=condition=available -n tenant-test kubernetes-test kubernetes-test-cluster-autoscaler kubernetes-test-kccm kubernetes-test-kcsi-controller
|
|
||||||
kubectl wait machinedeployment kubernetes-test-md0 -n tenant-test --timeout=1m --for=jsonpath='{.status.replicas}'=2
|
|
||||||
kubectl wait machinedeployment kubernetes-test-md0 -n tenant-test --timeout=5m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2
|
|
||||||
}
|
|
||||||
@@ -1,387 +0,0 @@
|
|||||||
#!/usr/bin/env bats
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
# Cozystack end‑to‑end provisioning test (Bats)
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@test "Environment variable COZYSTACK_INSTALLER_YAML is defined" {
|
|
||||||
if [ -z "${COZYSTACK_INSTALLER_YAML:-}" ]; then
|
|
||||||
echo 'COZYSTACK_INSTALLER_YAML environment variable is not set!' >&2
|
|
||||||
echo >&2
|
|
||||||
echo 'Please export it with the following command:' >&2
|
|
||||||
echo ' export COZYSTACK_INSTALLER_YAML=$(helm template -n cozy-system installer packages/core/installer)' >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "IPv4 forwarding is enabled" {
|
|
||||||
if [ "$(cat /proc/sys/net/ipv4/ip_forward)" != 1 ]; then
|
|
||||||
echo "IPv4 forwarding is disabled!" >&2
|
|
||||||
echo >&2
|
|
||||||
echo "Enable it with:" >&2
|
|
||||||
echo " echo 1 > /proc/sys/net/ipv4/ip_forward" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Clean previous VMs" {
|
|
||||||
kill $(cat srv1/qemu.pid srv2/qemu.pid srv3/qemu.pid 2>/dev/null) 2>/dev/null || true
|
|
||||||
rm -rf srv1 srv2 srv3
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Prepare networking and masquerading" {
|
|
||||||
ip link del cozy-br0 2>/dev/null || true
|
|
||||||
ip link add cozy-br0 type bridge
|
|
||||||
ip link set cozy-br0 up
|
|
||||||
ip address add 192.168.123.1/24 dev cozy-br0
|
|
||||||
|
|
||||||
# Masquerading rule – idempotent (delete first, then add)
|
|
||||||
iptables -t nat -D POSTROUTING -s 192.168.123.0/24 ! -d 192.168.123.0/24 -j MASQUERADE 2>/dev/null || true
|
|
||||||
iptables -t nat -A POSTROUTING -s 192.168.123.0/24 ! -d 192.168.123.0/24 -j MASQUERADE
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Prepare cloud‑init drive for VMs" {
|
|
||||||
mkdir -p srv1 srv2 srv3
|
|
||||||
|
|
||||||
# Generate cloud‑init ISOs
|
|
||||||
for i in 1 2 3; do
|
|
||||||
echo "hostname: srv${i}" > "srv${i}/meta-data"
|
|
||||||
|
|
||||||
cat > "srv${i}/user-data" <<'EOF'
|
|
||||||
#cloud-config
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "srv${i}/network-config" <<EOF
|
|
||||||
version: 2
|
|
||||||
ethernets:
|
|
||||||
eth0:
|
|
||||||
dhcp4: false
|
|
||||||
addresses:
|
|
||||||
- "192.168.123.1${i}/26"
|
|
||||||
gateway4: "192.168.123.1"
|
|
||||||
nameservers:
|
|
||||||
search: [cluster.local]
|
|
||||||
addresses: [8.8.8.8]
|
|
||||||
EOF
|
|
||||||
|
|
||||||
( cd "srv${i}" && genisoimage \
|
|
||||||
-output seed.img \
|
|
||||||
-volid cidata -rational-rock -joliet \
|
|
||||||
user-data meta-data network-config )
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Download Talos NoCloud image" {
|
|
||||||
if [ ! -f nocloud-amd64.raw ]; then
|
|
||||||
wget https://github.com/cozystack/cozystack/releases/latest/download/nocloud-amd64.raw.xz \
|
|
||||||
-O nocloud-amd64.raw.xz --show-progress --output-file /dev/stdout --progress=dot:giga 2>/dev/null
|
|
||||||
rm -f nocloud-amd64.raw
|
|
||||||
xz --decompress nocloud-amd64.raw.xz
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Prepare VM disks" {
|
|
||||||
for i in 1 2 3; do
|
|
||||||
cp nocloud-amd64.raw srv${i}/system.img
|
|
||||||
qemu-img resize srv${i}/system.img 20G
|
|
||||||
qemu-img create srv${i}/data.img 100G
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Create tap devices" {
|
|
||||||
for i in 1 2 3; do
|
|
||||||
ip link del cozy-srv${i} 2>/dev/null || true
|
|
||||||
ip tuntap add dev cozy-srv${i} mode tap
|
|
||||||
ip link set cozy-srv${i} up
|
|
||||||
ip link set cozy-srv${i} master cozy-br0
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Boot QEMU VMs" {
|
|
||||||
for i in 1 2 3; do
|
|
||||||
qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 8 -m 16384 \
|
|
||||||
-device virtio-net,netdev=net0,mac=52:54:00:12:34:5${i} \
|
|
||||||
-netdev tap,id=net0,ifname=cozy-srv${i},script=no,downscript=no \
|
|
||||||
-drive file=srv${i}/system.img,if=virtio,format=raw \
|
|
||||||
-drive file=srv${i}/seed.img,if=virtio,format=raw \
|
|
||||||
-drive file=srv${i}/data.img,if=virtio,format=raw \
|
|
||||||
-display none -daemonize -pidfile srv${i}/qemu.pid
|
|
||||||
done
|
|
||||||
|
|
||||||
# Give qemu a few seconds to start up networking
|
|
||||||
sleep 5
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Wait until Talos API port 50000 is reachable on all machines" {
|
|
||||||
timeout 60 sh -ec 'until nc -nz 192.168.123.11 50000 && nc -nz 192.168.123.12 50000 && nc -nz 192.168.123.13 50000; do sleep 1; done'
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Generate Talos cluster configuration" {
|
|
||||||
# Cluster‑wide patches
|
|
||||||
cat > patch.yaml <<'EOF'
|
|
||||||
machine:
|
|
||||||
kubelet:
|
|
||||||
nodeIP:
|
|
||||||
validSubnets:
|
|
||||||
- 192.168.123.0/24
|
|
||||||
extraConfig:
|
|
||||||
maxPods: 512
|
|
||||||
kernel:
|
|
||||||
modules:
|
|
||||||
- name: openvswitch
|
|
||||||
- name: drbd
|
|
||||||
parameters:
|
|
||||||
- usermode_helper=disabled
|
|
||||||
- name: zfs
|
|
||||||
- name: spl
|
|
||||||
registries:
|
|
||||||
mirrors:
|
|
||||||
docker.io:
|
|
||||||
endpoints:
|
|
||||||
- https://mirror.gcr.io
|
|
||||||
files:
|
|
||||||
- content: |
|
|
||||||
[plugins]
|
|
||||||
[plugins."io.containerd.cri.v1.runtime"]
|
|
||||||
device_ownership_from_security_context = true
|
|
||||||
path: /etc/cri/conf.d/20-customization.part
|
|
||||||
op: create
|
|
||||||
|
|
||||||
cluster:
|
|
||||||
apiServer:
|
|
||||||
extraArgs:
|
|
||||||
oidc-issuer-url: "https://keycloak.example.org/realms/cozy"
|
|
||||||
oidc-client-id: "kubernetes"
|
|
||||||
oidc-username-claim: "preferred_username"
|
|
||||||
oidc-groups-claim: "groups"
|
|
||||||
network:
|
|
||||||
cni:
|
|
||||||
name: none
|
|
||||||
dnsDomain: cozy.local
|
|
||||||
podSubnets:
|
|
||||||
- 10.244.0.0/16
|
|
||||||
serviceSubnets:
|
|
||||||
- 10.96.0.0/16
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Control‑plane‑only patches
|
|
||||||
cat > patch-controlplane.yaml <<'EOF'
|
|
||||||
machine:
|
|
||||||
nodeLabels:
|
|
||||||
node.kubernetes.io/exclude-from-external-load-balancers:
|
|
||||||
$patch: delete
|
|
||||||
network:
|
|
||||||
interfaces:
|
|
||||||
- interface: eth0
|
|
||||||
vip:
|
|
||||||
ip: 192.168.123.10
|
|
||||||
cluster:
|
|
||||||
allowSchedulingOnControlPlanes: true
|
|
||||||
controllerManager:
|
|
||||||
extraArgs:
|
|
||||||
bind-address: 0.0.0.0
|
|
||||||
scheduler:
|
|
||||||
extraArgs:
|
|
||||||
bind-address: 0.0.0.0
|
|
||||||
apiServer:
|
|
||||||
certSANs:
|
|
||||||
- 127.0.0.1
|
|
||||||
proxy:
|
|
||||||
disabled: true
|
|
||||||
discovery:
|
|
||||||
enabled: false
|
|
||||||
etcd:
|
|
||||||
advertisedSubnets:
|
|
||||||
- 192.168.123.0/24
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Generate secrets once
|
|
||||||
if [ ! -f secrets.yaml ]; then
|
|
||||||
talosctl gen secrets
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f controlplane.yaml worker.yaml talosconfig kubeconfig
|
|
||||||
talosctl gen config --with-secrets secrets.yaml cozystack https://192.168.123.10:6443 \
|
|
||||||
--config-patch=@patch.yaml --config-patch-control-plane @patch-controlplane.yaml
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Apply Talos configuration to the node" {
|
|
||||||
# Apply the configuration to all three nodes
|
|
||||||
for node in 11 12 13; do
|
|
||||||
talosctl apply -f controlplane.yaml -n 192.168.123.${node} -e 192.168.123.${node} -i
|
|
||||||
done
|
|
||||||
|
|
||||||
# Wait for Talos services to come up again
|
|
||||||
timeout 60 sh -ec 'until nc -nz 192.168.123.11 50000 && nc -nz 192.168.123.12 50000 && nc -nz 192.168.123.13 50000; do sleep 1; done'
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Bootstrap Talos cluster" {
|
|
||||||
# Bootstrap etcd on the first node
|
|
||||||
timeout 10 sh -ec 'until talosctl bootstrap -n 192.168.123.11 -e 192.168.123.11; do sleep 1; done'
|
|
||||||
|
|
||||||
# Wait until etcd is healthy
|
|
||||||
timeout 180 sh -ec 'until talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 >/dev/null 2>&1; do sleep 1; done'
|
|
||||||
timeout 60 sh -ec 'while talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 2>&1 | grep -q "rpc error"; do sleep 1; done'
|
|
||||||
|
|
||||||
# Retrieve kubeconfig
|
|
||||||
rm -f kubeconfig
|
|
||||||
talosctl kubeconfig kubeconfig -e 192.168.123.10 -n 192.168.123.10
|
|
||||||
|
|
||||||
# Wait until all three nodes register in Kubernetes
|
|
||||||
timeout 60 sh -ec 'until [ $(kubectl get node --no-headers | wc -l) -eq 3 ]; do sleep 1; done'
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Install Cozystack" {
|
|
||||||
# Create namespace & configmap required by installer
|
|
||||||
kubectl create namespace cozy-system --dry-run=client -o yaml | kubectl apply -f -
|
|
||||||
kubectl create configmap cozystack -n cozy-system \
|
|
||||||
--from-literal=bundle-name=paas-full \
|
|
||||||
--from-literal=ipv4-pod-cidr=10.244.0.0/16 \
|
|
||||||
--from-literal=ipv4-pod-gateway=10.244.0.1 \
|
|
||||||
--from-literal=ipv4-svc-cidr=10.96.0.0/16 \
|
|
||||||
--from-literal=ipv4-join-cidr=100.64.0.0/16 \
|
|
||||||
--from-literal=root-host=example.org \
|
|
||||||
--from-literal=api-server-endpoint=https://192.168.123.10:6443 \
|
|
||||||
--dry-run=client -o yaml | kubectl apply -f -
|
|
||||||
|
|
||||||
# Apply installer manifests from env variable
|
|
||||||
echo "$COZYSTACK_INSTALLER_YAML" | kubectl apply -f -
|
|
||||||
|
|
||||||
# Wait for the installer deployment to become available
|
|
||||||
kubectl wait deployment/cozystack -n cozy-system --timeout=1m --for=condition=Available
|
|
||||||
|
|
||||||
# Wait until HelmReleases appear & reconcile them
|
|
||||||
timeout 60 sh -ec 'until kubectl get hr -A | grep -q cozys; do sleep 1; done'
|
|
||||||
sleep 5
|
|
||||||
kubectl get hr -A | awk 'NR>1 {print "kubectl wait --timeout=15m --for=condition=ready -n "$1" hr/"$2" &"} END {print "wait"}' | sh -ex
|
|
||||||
|
|
||||||
# Fail the test if any HelmRelease is not Ready
|
|
||||||
if kubectl get hr -A | grep -v " True " | grep -v NAME; then
|
|
||||||
kubectl get hr -A
|
|
||||||
fail "Some HelmReleases failed to reconcile"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Wait for Cluster‑API provider deployments" {
|
|
||||||
# Wait for Cluster‑API provider deployments
|
|
||||||
timeout 60 sh -ec 'until kubectl get deploy -n cozy-cluster-api capi-controller-manager capi-kamaji-controller-manager capi-kubeadm-bootstrap-controller-manager capi-operator-cluster-api-operator capk-controller-manager >/dev/null 2>&1; do sleep 1; done'
|
|
||||||
kubectl wait deployment/capi-controller-manager deployment/capi-kamaji-controller-manager deployment/capi-kubeadm-bootstrap-controller-manager deployment/capi-operator-cluster-api-operator deployment/capk-controller-manager -n cozy-cluster-api --timeout=1m --for=condition=available
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Wait for LINSTOR and configure storage" {
|
|
||||||
# Linstor controller and nodes
|
|
||||||
kubectl wait deployment/linstor-controller -n cozy-linstor --timeout=5m --for=condition=available
|
|
||||||
timeout 60 sh -ec 'until [ $(kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor node list | grep -c Online) -eq 3 ]; do sleep 1; done'
|
|
||||||
|
|
||||||
for node in srv1 srv2 srv3; do
|
|
||||||
kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor ps cdp zfs ${node} /dev/vdc --pool-name data --storage-pool data
|
|
||||||
done
|
|
||||||
|
|
||||||
# Storage classes
|
|
||||||
kubectl apply -f - <<'EOF'
|
|
||||||
---
|
|
||||||
apiVersion: storage.k8s.io/v1
|
|
||||||
kind: StorageClass
|
|
||||||
metadata:
|
|
||||||
name: local
|
|
||||||
annotations:
|
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
|
||||||
provisioner: linstor.csi.linbit.com
|
|
||||||
parameters:
|
|
||||||
linstor.csi.linbit.com/storagePool: "data"
|
|
||||||
linstor.csi.linbit.com/layerList: "storage"
|
|
||||||
linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"
|
|
||||||
volumeBindingMode: WaitForFirstConsumer
|
|
||||||
allowVolumeExpansion: true
|
|
||||||
---
|
|
||||||
apiVersion: storage.k8s.io/v1
|
|
||||||
kind: StorageClass
|
|
||||||
metadata:
|
|
||||||
name: replicated
|
|
||||||
provisioner: linstor.csi.linbit.com
|
|
||||||
parameters:
|
|
||||||
linstor.csi.linbit.com/storagePool: "data"
|
|
||||||
linstor.csi.linbit.com/autoPlace: "3"
|
|
||||||
linstor.csi.linbit.com/layerList: "drbd storage"
|
|
||||||
linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"
|
|
||||||
property.linstor.csi.linbit.com/DrbdOptions/auto-quorum: suspend-io
|
|
||||||
property.linstor.csi.linbit.com/DrbdOptions/Resource/on-no-data-accessible: suspend-io
|
|
||||||
property.linstor.csi.linbit.com/DrbdOptions/Resource/on-suspended-primary-outdated: force-secondary
|
|
||||||
property.linstor.csi.linbit.com/DrbdOptions/Net/rr-conflict: retry-connect
|
|
||||||
volumeBindingMode: WaitForFirstConsumer
|
|
||||||
allowVolumeExpansion: true
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Wait for MetalLB and configure address pool" {
|
|
||||||
# MetalLB address pool
|
|
||||||
kubectl apply -f - <<'EOF'
|
|
||||||
---
|
|
||||||
apiVersion: metallb.io/v1beta1
|
|
||||||
kind: L2Advertisement
|
|
||||||
metadata:
|
|
||||||
name: cozystack
|
|
||||||
namespace: cozy-metallb
|
|
||||||
spec:
|
|
||||||
ipAddressPools: [cozystack]
|
|
||||||
---
|
|
||||||
apiVersion: metallb.io/v1beta1
|
|
||||||
kind: IPAddressPool
|
|
||||||
metadata:
|
|
||||||
name: cozystack
|
|
||||||
namespace: cozy-metallb
|
|
||||||
spec:
|
|
||||||
addresses: [192.168.123.200-192.168.123.250]
|
|
||||||
autoAssign: true
|
|
||||||
avoidBuggyIPs: false
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Check Cozystack API service" {
|
|
||||||
kubectl wait --for=condition=Available apiservices/v1alpha1.apps.cozystack.io --timeout=2m
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Configure Tenant and wait for applications" {
|
|
||||||
# Patch root tenant and wait for its releases
|
|
||||||
kubectl patch tenants/root -n tenant-root --type merge -p '{"spec":{"host":"example.org","ingress":true,"monitoring":true,"etcd":true,"isolated":true}}'
|
|
||||||
|
|
||||||
timeout 60 sh -ec 'until kubectl get hr -n tenant-root etcd ingress monitoring tenant-root >/dev/null 2>&1; do sleep 1; done'
|
|
||||||
kubectl wait hr/etcd hr/ingress hr/tenant-root -n tenant-root --timeout=2m --for=condition=ready
|
|
||||||
|
|
||||||
if ! kubectl wait hr/monitoring -n tenant-root --timeout=2m --for=condition=ready; then
|
|
||||||
flux reconcile hr monitoring -n tenant-root --force
|
|
||||||
kubectl wait hr/monitoring -n tenant-root --timeout=2m --for=condition=ready
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Expose Cozystack services through ingress
|
|
||||||
kubectl patch configmap/cozystack -n cozy-system --type merge -p '{"data":{"expose-services":"api,dashboard,cdi-uploadproxy,vm-exportproxy,keycloak"}}'
|
|
||||||
|
|
||||||
# NGINX ingress controller
|
|
||||||
timeout 60 sh -ec 'until kubectl get deploy root-ingress-controller -n tenant-root >/dev/null 2>&1; do sleep 1; done'
|
|
||||||
kubectl wait deploy/root-ingress-controller -n tenant-root --timeout=5m --for=condition=available
|
|
||||||
|
|
||||||
# etcd statefulset
|
|
||||||
kubectl wait sts/etcd -n tenant-root --for=jsonpath='{.status.readyReplicas}'=3 --timeout=5m
|
|
||||||
|
|
||||||
# VictoriaMetrics components
|
|
||||||
kubectl wait vmalert/vmalert-shortterm vmalertmanager/alertmanager -n tenant-root --for=jsonpath='{.status.updateStatus}'=operational --timeout=5m
|
|
||||||
kubectl wait vlogs/generic -n tenant-root --for=jsonpath='{.status.updateStatus}'=operational --timeout=5m
|
|
||||||
kubectl wait vmcluster/shortterm vmcluster/longterm -n tenant-root --for=jsonpath='{.status.clusterStatus}'=operational --timeout=5m
|
|
||||||
|
|
||||||
# Grafana
|
|
||||||
kubectl wait clusters.postgresql.cnpg.io/grafana-db -n tenant-root --for=condition=ready --timeout=5m
|
|
||||||
kubectl wait deploy/grafana-deployment -n tenant-root --for=condition=available --timeout=5m
|
|
||||||
|
|
||||||
# Verify Grafana via ingress
|
|
||||||
ingress_ip=$(kubectl get svc root-ingress-controller -n tenant-root -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
|
|
||||||
if ! curl -sS -k "https://${ingress_ip}" -H 'Host: grafana.example.org' --max-time 30 | grep -q Found; then
|
|
||||||
echo "Failed to access Grafana via ingress at ${ingress_ip}" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "Keycloak OIDC stack is healthy" {
|
|
||||||
kubectl patch configmap/cozystack -n cozy-system --type merge -p '{"data":{"oidc-enabled":"true"}}'
|
|
||||||
|
|
||||||
timeout 120 sh -ec 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator >/dev/null 2>&1; do sleep 1; done'
|
|
||||||
kubectl wait hr/keycloak hr/keycloak-configure hr/keycloak-operator -n cozy-keycloak --timeout=10m --for=condition=ready
|
|
||||||
}
|
|
||||||
370
hack/e2e.sh
Executable file
370
hack/e2e.sh
Executable file
@@ -0,0 +1,370 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
if [ "$COZYSTACK_INSTALLER_YAML" = "" ]; then
|
||||||
|
echo 'COZYSTACK_INSTALLER_YAML variable is not set!' >&2
|
||||||
|
echo 'please set it with following command:' >&2
|
||||||
|
echo >&2
|
||||||
|
echo 'export COZYSTACK_INSTALLER_YAML=$(helm template -n cozy-system installer packages/core/installer)' >&2
|
||||||
|
echo >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$(cat /proc/sys/net/ipv4/ip_forward)" != 1 ]; then
|
||||||
|
echo "IPv4 forwarding is not enabled!" >&2
|
||||||
|
echo 'please enable forwarding with the following command:' >&2
|
||||||
|
echo >&2
|
||||||
|
echo 'echo 1 > /proc/sys/net/ipv4/ip_forward' >&2
|
||||||
|
echo >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
set -x
|
||||||
|
set -e
|
||||||
|
|
||||||
|
kill `cat srv1/qemu.pid srv2/qemu.pid srv3/qemu.pid` || true
|
||||||
|
|
||||||
|
ip link del cozy-br0 || true
|
||||||
|
ip link add cozy-br0 type bridge
|
||||||
|
ip link set cozy-br0 up
|
||||||
|
ip addr add 192.168.123.1/24 dev cozy-br0
|
||||||
|
|
||||||
|
# Enable masquerading
|
||||||
|
iptables -t nat -D POSTROUTING -s 192.168.123.0/24 ! -d 192.168.123.0/24 -j MASQUERADE 2>/dev/null || true
|
||||||
|
iptables -t nat -A POSTROUTING -s 192.168.123.0/24 ! -d 192.168.123.0/24 -j MASQUERADE
|
||||||
|
|
||||||
|
rm -rf srv1 srv2 srv3
|
||||||
|
mkdir -p srv1 srv2 srv3
|
||||||
|
|
||||||
|
# Prepare cloud-init
|
||||||
|
for i in 1 2 3; do
|
||||||
|
echo "hostname: srv$i" > "srv$i/meta-data"
|
||||||
|
echo '#cloud-config' > "srv$i/user-data"
|
||||||
|
cat > "srv$i/network-config" <<EOT
|
||||||
|
version: 2
|
||||||
|
ethernets:
|
||||||
|
eth0:
|
||||||
|
dhcp4: false
|
||||||
|
addresses:
|
||||||
|
- "192.168.123.1$i/26"
|
||||||
|
gateway4: "192.168.123.1"
|
||||||
|
nameservers:
|
||||||
|
search: [cluster.local]
|
||||||
|
addresses: [8.8.8.8]
|
||||||
|
EOT
|
||||||
|
|
||||||
|
( cd srv$i && genisoimage \
|
||||||
|
-output seed.img \
|
||||||
|
-volid cidata -rational-rock -joliet \
|
||||||
|
user-data meta-data network-config
|
||||||
|
)
|
||||||
|
done
|
||||||
|
|
||||||
|
# Prepare system drive
|
||||||
|
if [ ! -f nocloud-amd64.raw ]; then
|
||||||
|
wget https://github.com/cozystack/cozystack/releases/latest/download/nocloud-amd64.raw.xz \
|
||||||
|
-O nocloud-amd64.raw.xz --show-progress --output-file /dev/stdout --progress=dot:giga 2>/dev/null
|
||||||
|
rm -f nocloud-amd64.raw
|
||||||
|
xz --decompress nocloud-amd64.raw.xz
|
||||||
|
fi
|
||||||
|
for i in 1 2 3; do
|
||||||
|
cp nocloud-amd64.raw srv$i/system.img
|
||||||
|
qemu-img resize srv$i/system.img 20G
|
||||||
|
done
|
||||||
|
|
||||||
|
# Prepare data drives
|
||||||
|
for i in 1 2 3; do
|
||||||
|
qemu-img create srv$i/data.img 100G
|
||||||
|
done
|
||||||
|
|
||||||
|
# Prepare networking
|
||||||
|
for i in 1 2 3; do
|
||||||
|
ip link del cozy-srv$i || true
|
||||||
|
ip tuntap add dev cozy-srv$i mode tap
|
||||||
|
ip link set cozy-srv$i up
|
||||||
|
ip link set cozy-srv$i master cozy-br0
|
||||||
|
done
|
||||||
|
|
||||||
|
# Start VMs
|
||||||
|
for i in 1 2 3; do
|
||||||
|
qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 8 -m 16384 \
|
||||||
|
-device virtio-net,netdev=net0,mac=52:54:00:12:34:5$i \
|
||||||
|
-netdev tap,id=net0,ifname=cozy-srv$i,script=no,downscript=no \
|
||||||
|
-drive file=srv$i/system.img,if=virtio,format=raw \
|
||||||
|
-drive file=srv$i/seed.img,if=virtio,format=raw \
|
||||||
|
-drive file=srv$i/data.img,if=virtio,format=raw \
|
||||||
|
-display none -daemonize -pidfile srv$i/qemu.pid
|
||||||
|
done
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
# Wait for VM to start up
|
||||||
|
timeout 60 sh -c 'until nc -nzv 192.168.123.11 50000 && nc -nzv 192.168.123.12 50000 && nc -nzv 192.168.123.13 50000; do sleep 1; done'
|
||||||
|
|
||||||
|
cat > patch.yaml <<\EOT
|
||||||
|
machine:
|
||||||
|
kubelet:
|
||||||
|
nodeIP:
|
||||||
|
validSubnets:
|
||||||
|
- 192.168.123.0/24
|
||||||
|
extraConfig:
|
||||||
|
maxPods: 512
|
||||||
|
kernel:
|
||||||
|
modules:
|
||||||
|
- name: openvswitch
|
||||||
|
- name: drbd
|
||||||
|
parameters:
|
||||||
|
- usermode_helper=disabled
|
||||||
|
- name: zfs
|
||||||
|
- name: spl
|
||||||
|
registries:
|
||||||
|
mirrors:
|
||||||
|
docker.io:
|
||||||
|
endpoints:
|
||||||
|
- https://mirror.gcr.io
|
||||||
|
files:
|
||||||
|
- content: |
|
||||||
|
[plugins]
|
||||||
|
[plugins."io.containerd.cri.v1.runtime"]
|
||||||
|
device_ownership_from_security_context = true
|
||||||
|
path: /etc/cri/conf.d/20-customization.part
|
||||||
|
op: create
|
||||||
|
|
||||||
|
cluster:
|
||||||
|
apiServer:
|
||||||
|
extraArgs:
|
||||||
|
oidc-issuer-url: "https://keycloak.example.org/realms/cozy"
|
||||||
|
oidc-client-id: "kubernetes"
|
||||||
|
oidc-username-claim: "preferred_username"
|
||||||
|
oidc-groups-claim: "groups"
|
||||||
|
network:
|
||||||
|
cni:
|
||||||
|
name: none
|
||||||
|
dnsDomain: cozy.local
|
||||||
|
podSubnets:
|
||||||
|
- 10.244.0.0/16
|
||||||
|
serviceSubnets:
|
||||||
|
- 10.96.0.0/16
|
||||||
|
EOT
|
||||||
|
|
||||||
|
cat > patch-controlplane.yaml <<\EOT
|
||||||
|
machine:
|
||||||
|
nodeLabels:
|
||||||
|
node.kubernetes.io/exclude-from-external-load-balancers:
|
||||||
|
$patch: delete
|
||||||
|
network:
|
||||||
|
interfaces:
|
||||||
|
- interface: eth0
|
||||||
|
vip:
|
||||||
|
ip: 192.168.123.10
|
||||||
|
cluster:
|
||||||
|
allowSchedulingOnControlPlanes: true
|
||||||
|
controllerManager:
|
||||||
|
extraArgs:
|
||||||
|
bind-address: 0.0.0.0
|
||||||
|
scheduler:
|
||||||
|
extraArgs:
|
||||||
|
bind-address: 0.0.0.0
|
||||||
|
apiServer:
|
||||||
|
certSANs:
|
||||||
|
- 127.0.0.1
|
||||||
|
proxy:
|
||||||
|
disabled: true
|
||||||
|
discovery:
|
||||||
|
enabled: false
|
||||||
|
etcd:
|
||||||
|
advertisedSubnets:
|
||||||
|
- 192.168.123.0/24
|
||||||
|
EOT
|
||||||
|
|
||||||
|
# Gen configuration
|
||||||
|
if [ ! -f secrets.yaml ]; then
|
||||||
|
talosctl gen secrets
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f controlplane.yaml worker.yaml talosconfig kubeconfig
|
||||||
|
talosctl gen config --with-secrets secrets.yaml cozystack https://192.168.123.10:6443 --config-patch=@patch.yaml --config-patch-control-plane @patch-controlplane.yaml
|
||||||
|
export TALOSCONFIG=$PWD/talosconfig
|
||||||
|
|
||||||
|
# Apply configuration
|
||||||
|
talosctl apply -f controlplane.yaml -n 192.168.123.11 -e 192.168.123.11 -i
|
||||||
|
talosctl apply -f controlplane.yaml -n 192.168.123.12 -e 192.168.123.12 -i
|
||||||
|
talosctl apply -f controlplane.yaml -n 192.168.123.13 -e 192.168.123.13 -i
|
||||||
|
|
||||||
|
# Wait for VM to be configured
|
||||||
|
timeout 60 sh -c 'until nc -nzv 192.168.123.11 50000 && nc -nzv 192.168.123.12 50000 && nc -nzv 192.168.123.13 50000; do sleep 1; done'
|
||||||
|
|
||||||
|
# Bootstrap
|
||||||
|
timeout 10 sh -c 'until talosctl bootstrap -n 192.168.123.11 -e 192.168.123.11; do sleep 1; done'
|
||||||
|
|
||||||
|
# Wait for etcd
|
||||||
|
timeout 180 sh -c 'until timeout -s 9 2 talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 2>&1; do sleep 1; done'
|
||||||
|
timeout 60 sh -c 'while talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 2>&1 | grep "rpc error"; do sleep 1; done'
|
||||||
|
|
||||||
|
rm -f kubeconfig
|
||||||
|
talosctl kubeconfig kubeconfig -e 192.168.123.10 -n 192.168.123.10
|
||||||
|
export KUBECONFIG=$PWD/kubeconfig
|
||||||
|
|
||||||
|
# Wait for kubernetes nodes appear
|
||||||
|
timeout 60 sh -c 'until [ $(kubectl get node -o name | wc -l) = 3 ]; do sleep 1; done'
|
||||||
|
kubectl create ns cozy-system -o yaml | kubectl apply -f -
|
||||||
|
kubectl create -f - <<\EOT
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: cozystack
|
||||||
|
namespace: cozy-system
|
||||||
|
data:
|
||||||
|
bundle-name: "paas-full"
|
||||||
|
ipv4-pod-cidr: "10.244.0.0/16"
|
||||||
|
ipv4-pod-gateway: "10.244.0.1"
|
||||||
|
ipv4-svc-cidr: "10.96.0.0/16"
|
||||||
|
ipv4-join-cidr: "100.64.0.0/16"
|
||||||
|
root-host: example.org
|
||||||
|
api-server-endpoint: https://192.168.123.10:6443
|
||||||
|
EOT
|
||||||
|
|
||||||
|
#
|
||||||
|
echo "$COZYSTACK_INSTALLER_YAML" | kubectl apply -f -
|
||||||
|
|
||||||
|
# wait for cozystack pod to start
|
||||||
|
kubectl wait deploy --timeout=1m --for=condition=available -n cozy-system cozystack
|
||||||
|
|
||||||
|
# wait for helmreleases appear
|
||||||
|
timeout 60 sh -c 'until kubectl get hr -A | grep cozy; do sleep 1; done'
|
||||||
|
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
# Wait for all HelmReleases to be installed
|
||||||
|
kubectl get hr -A | awk 'NR>1 {print "kubectl wait --timeout=15m --for=condition=ready -n " $1 " hr/" $2 " &"} END{print "wait"}' | sh -x
|
||||||
|
|
||||||
|
failed_hrs=$(kubectl get hr -A | grep -v True)
|
||||||
|
if [ -n "$(echo "$failed_hrs" | grep -v NAME)" ]; then
|
||||||
|
printf 'Failed HelmReleases:\n%s\n' "$failed_hrs" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Wait for Cluster-API providers
|
||||||
|
timeout 60 sh -c 'until kubectl get deploy -n cozy-cluster-api capi-controller-manager capi-kamaji-controller-manager capi-kubeadm-bootstrap-controller-manager capi-operator-cluster-api-operator capk-controller-manager; do sleep 1; done'
|
||||||
|
kubectl wait deploy --timeout=1m --for=condition=available -n cozy-cluster-api capi-controller-manager capi-kamaji-controller-manager capi-kubeadm-bootstrap-controller-manager capi-operator-cluster-api-operator capk-controller-manager
|
||||||
|
|
||||||
|
# Wait for linstor controller
|
||||||
|
kubectl wait deploy --timeout=5m --for=condition=available -n cozy-linstor linstor-controller
|
||||||
|
|
||||||
|
# Wait for all linstor nodes become Online
|
||||||
|
timeout 60 sh -c 'until [ $(kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor node list | grep -c Online) = 3 ]; do sleep 1; done'
|
||||||
|
|
||||||
|
kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor ps cdp zfs srv1 /dev/vdc --pool-name data --storage-pool data
|
||||||
|
kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor ps cdp zfs srv2 /dev/vdc --pool-name data --storage-pool data
|
||||||
|
kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor ps cdp zfs srv3 /dev/vdc --pool-name data --storage-pool data
|
||||||
|
|
||||||
|
kubectl create -f- <<EOT
|
||||||
|
---
|
||||||
|
apiVersion: storage.k8s.io/v1
|
||||||
|
kind: StorageClass
|
||||||
|
metadata:
|
||||||
|
name: local
|
||||||
|
annotations:
|
||||||
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
|
provisioner: linstor.csi.linbit.com
|
||||||
|
parameters:
|
||||||
|
linstor.csi.linbit.com/storagePool: "data"
|
||||||
|
linstor.csi.linbit.com/layerList: "storage"
|
||||||
|
linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"
|
||||||
|
volumeBindingMode: WaitForFirstConsumer
|
||||||
|
allowVolumeExpansion: true
|
||||||
|
---
|
||||||
|
apiVersion: storage.k8s.io/v1
|
||||||
|
kind: StorageClass
|
||||||
|
metadata:
|
||||||
|
name: replicated
|
||||||
|
provisioner: linstor.csi.linbit.com
|
||||||
|
parameters:
|
||||||
|
linstor.csi.linbit.com/storagePool: "data"
|
||||||
|
linstor.csi.linbit.com/autoPlace: "3"
|
||||||
|
linstor.csi.linbit.com/layerList: "drbd storage"
|
||||||
|
linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"
|
||||||
|
property.linstor.csi.linbit.com/DrbdOptions/auto-quorum: suspend-io
|
||||||
|
property.linstor.csi.linbit.com/DrbdOptions/Resource/on-no-data-accessible: suspend-io
|
||||||
|
property.linstor.csi.linbit.com/DrbdOptions/Resource/on-suspended-primary-outdated: force-secondary
|
||||||
|
property.linstor.csi.linbit.com/DrbdOptions/Net/rr-conflict: retry-connect
|
||||||
|
volumeBindingMode: WaitForFirstConsumer
|
||||||
|
allowVolumeExpansion: true
|
||||||
|
EOT
|
||||||
|
kubectl create -f- <<EOT
|
||||||
|
---
|
||||||
|
apiVersion: metallb.io/v1beta1
|
||||||
|
kind: L2Advertisement
|
||||||
|
metadata:
|
||||||
|
name: cozystack
|
||||||
|
namespace: cozy-metallb
|
||||||
|
spec:
|
||||||
|
ipAddressPools:
|
||||||
|
- cozystack
|
||||||
|
---
|
||||||
|
apiVersion: metallb.io/v1beta1
|
||||||
|
kind: IPAddressPool
|
||||||
|
metadata:
|
||||||
|
name: cozystack
|
||||||
|
namespace: cozy-metallb
|
||||||
|
spec:
|
||||||
|
addresses:
|
||||||
|
- 192.168.123.200-192.168.123.250
|
||||||
|
autoAssign: true
|
||||||
|
avoidBuggyIPs: false
|
||||||
|
EOT
|
||||||
|
|
||||||
|
# Wait for cozystack-api
|
||||||
|
kubectl wait --for=condition=Available apiservices v1alpha1.apps.cozystack.io --timeout=2m
|
||||||
|
|
||||||
|
kubectl patch -n tenant-root tenants.apps.cozystack.io root --type=merge -p '{"spec":{
|
||||||
|
"host": "example.org",
|
||||||
|
"ingress": true,
|
||||||
|
"monitoring": true,
|
||||||
|
"etcd": true,
|
||||||
|
"isolated": true
|
||||||
|
}}'
|
||||||
|
|
||||||
|
# Wait for HelmRelease be created
|
||||||
|
timeout 60 sh -c 'until kubectl get hr -n tenant-root etcd ingress monitoring tenant-root; do sleep 1; done'
|
||||||
|
|
||||||
|
# Wait for HelmReleases be installed
|
||||||
|
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr etcd ingress tenant-root
|
||||||
|
|
||||||
|
if ! kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr monitoring; then
|
||||||
|
flux reconcile hr monitoring -n tenant-root --force
|
||||||
|
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr monitoring
|
||||||
|
fi
|
||||||
|
|
||||||
|
kubectl patch -n tenant-root ingresses.apps.cozystack.io ingress --type=merge -p '{"spec":{
|
||||||
|
"dashboard": true
|
||||||
|
}}'
|
||||||
|
|
||||||
|
# Wait for nginx-ingress-controller
|
||||||
|
timeout 60 sh -c 'until kubectl get deploy -n tenant-root root-ingress-controller; do sleep 1; done'
|
||||||
|
kubectl wait --timeout=5m --for=condition=available -n tenant-root deploy root-ingress-controller
|
||||||
|
|
||||||
|
# Wait for etcd
|
||||||
|
kubectl wait --timeout=5m --for=jsonpath=.status.readyReplicas=3 -n tenant-root sts etcd
|
||||||
|
|
||||||
|
# Wait for Victoria metrics
|
||||||
|
kubectl wait --timeout=5m --for=jsonpath=.status.updateStatus=operational -n tenant-root vmalert/vmalert-shortterm vmalertmanager/alertmanager
|
||||||
|
kubectl wait --timeout=5m --for=jsonpath=.status.updateStatus=operational -n tenant-root vlogs/generic
|
||||||
|
kubectl wait --timeout=5m --for=jsonpath=.status.clusterStatus=operational -n tenant-root vmcluster/shortterm vmcluster/longterm
|
||||||
|
|
||||||
|
# Wait for grafana
|
||||||
|
kubectl wait --timeout=5m --for=condition=ready -n tenant-root clusters.postgresql.cnpg.io grafana-db
|
||||||
|
kubectl wait --timeout=5m --for=condition=available -n tenant-root deploy grafana-deployment
|
||||||
|
|
||||||
|
# Get IP of nginx-ingress
|
||||||
|
ip=$(kubectl get svc -n tenant-root root-ingress-controller -o jsonpath='{.status.loadBalancer.ingress..ip}')
|
||||||
|
|
||||||
|
# Check Grafana
|
||||||
|
curl -sS -k "https://$ip" -H 'Host: grafana.example.org' | grep Found
|
||||||
|
|
||||||
|
|
||||||
|
# Test OIDC
|
||||||
|
kubectl patch -n cozy-system cm/cozystack --type=merge -p '{"data":{
|
||||||
|
"oidc-enabled": "true"
|
||||||
|
}}'
|
||||||
|
|
||||||
|
timeout 120 sh -c 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator; do sleep 1; done'
|
||||||
|
kubectl wait --timeout=10m --for=condition=ready -n cozy-keycloak hr keycloak keycloak-configure keycloak-operator
|
||||||
@@ -16,15 +16,13 @@ if [ ! -f "$file" ] || [ ! -s "$file" ]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
miss_map=$(mktemp)
|
miss_map=$(echo "$new_map" | awk 'NR==FNR { nm[$1 " " $2] = $3; next } { if (!($1 " " $2 in nm)) print $1, $2, $3}' - "$file")
|
||||||
trap 'rm -f "$miss_map"' EXIT
|
|
||||||
echo -n "$new_map" | awk 'NR==FNR { nm[$1 " " $2] = $3; next } { if (!($1 " " $2 in nm)) print $1, $2, $3}' - "$file" > $miss_map
|
|
||||||
|
|
||||||
# search accross all tags sorted by version
|
# search accross all tags sorted by version
|
||||||
search_commits=$(git ls-remote --tags origin | awk -F/ '$3 ~ /v[0-9]+.[0-9]+.[0-9]+/ {print}' | sort -k2,2 -rV | awk '{print $1}')
|
search_commits=$(git ls-remote --tags origin | awk -F/ '$3 ~ /v[0-9]+.[0-9]+.[0-9]+/ {print}' | sort -k2,2 -rV | awk '{print $1}')
|
||||||
|
|
||||||
resolved_miss_map=$(
|
resolved_miss_map=$(
|
||||||
while read -r chart version commit; do
|
echo "$miss_map" | while read -r chart version commit; do
|
||||||
# if version is found in HEAD, it's HEAD
|
# if version is found in HEAD, it's HEAD
|
||||||
if [ "$(awk '$1 == "version:" {print $2}' ./${chart}/Chart.yaml)" = "${version}" ]; then
|
if [ "$(awk '$1 == "version:" {print $2}' ./${chart}/Chart.yaml)" = "${version}" ]; then
|
||||||
echo "$chart $version HEAD"
|
echo "$chart $version HEAD"
|
||||||
@@ -58,7 +56,7 @@ resolved_miss_map=$(
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$chart $version $found_tag"
|
echo "$chart $version $found_tag"
|
||||||
done < $miss_map
|
done
|
||||||
)
|
)
|
||||||
|
|
||||||
printf "%s\n" "$new_map" "$resolved_miss_map" | sort -k1,1 -k2,2 -V | awk '!seen[$1, $2]++' > "$file"
|
printf "%s\n" "$new_map" "$resolved_miss_map" | sort -k1,1 -k2,2 -V | awk '$1' > "$file"
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
printf "%s\n" "Usage:" >&2 ;
|
|
||||||
printf -- "%s\n" '---' >&2 ;
|
|
||||||
printf "%s %s\n" "$0" "INPUT_DIR OUTPUT_DIR TMP_DIR [DEPENDENCY_DIR]" >&2 ;
|
|
||||||
printf -- "%s\n" '---' >&2 ;
|
|
||||||
printf "%s\n" "Takes a helm repository from INPUT_DIR, with an optional library repository in" >&2 ;
|
|
||||||
printf "%s\n" "DEPENDENCY_DIR, prepares a view of the git archive at select points in history" >&2 ;
|
|
||||||
printf "%s\n" "in TMP_DIR and packages helm charts, outputting the tarballs to OUTPUT_DIR" >&2 ;
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "x$(basename $PWD)" != "xpackages" ]
|
|
||||||
then
|
|
||||||
echo "Error: This script must run from the ./packages/ directory" >&2
|
|
||||||
echo >&2
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$#" != "x3" ] && [ "x$#" != "x4" ]
|
|
||||||
then
|
|
||||||
echo "Error: This script takes 3 or 4 arguments" >&2
|
|
||||||
echo "Got $# arguments:" "$@" >&2
|
|
||||||
echo >&2
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
input_dir=$1
|
|
||||||
output_dir=$2
|
|
||||||
tmp_dir=$3
|
|
||||||
|
|
||||||
if [ "x$#" = "x4" ]
|
|
||||||
then
|
|
||||||
dependency_dir=$4
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf "${output_dir:?}"
|
|
||||||
mkdir -p "${output_dir}"
|
|
||||||
while read package _ commit
|
|
||||||
do
|
|
||||||
# this lets devs build the packages from a dirty repo for quick local testing
|
|
||||||
if [ "x$commit" = "xHEAD" ]
|
|
||||||
then
|
|
||||||
helm package "${input_dir}/${package}" -d "${output_dir}"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
git archive --format tar "${commit}" "${input_dir}/${package}" | tar -xf- -C "${tmp_dir}/"
|
|
||||||
|
|
||||||
# the library chart is not present in older commits and git archive doesn't fail gracefully if the path is not found
|
|
||||||
if [ "x${dependency_dir}" != "x" ] && git ls-tree --name-only "${commit}" "${dependency_dir}" | grep -qx "${dependency_dir}"
|
|
||||||
then
|
|
||||||
git archive --format tar "${commit}" "${dependency_dir}" | tar -xf- -C "${tmp_dir}/"
|
|
||||||
fi
|
|
||||||
helm package "${tmp_dir}/${input_dir}/${package}" -d "${output_dir}"
|
|
||||||
rm -rf "${tmp_dir:?}/${input_dir:?}/${package:?}"
|
|
||||||
if [ "x${dependency_dir}" != "x" ]
|
|
||||||
then
|
|
||||||
rm -rf "${tmp_dir:?}/${dependency_dir:?}"
|
|
||||||
fi
|
|
||||||
done < "${input_dir}/versions_map"
|
|
||||||
helm repo index "${output_dir}"
|
|
||||||
@@ -1,8 +1,14 @@
|
|||||||
OUT=../_out/repos/apps
|
OUT=../../_out/repos/apps
|
||||||
TMP := $(shell mktemp -d)
|
TMP=../../_out/repos/apps/historical
|
||||||
|
|
||||||
repo:
|
repo:
|
||||||
cd .. && ../hack/package_chart.sh apps $(OUT) $(TMP) library
|
rm -rf "$(OUT)"
|
||||||
|
mkdir -p "$(OUT)"
|
||||||
|
awk '$$3 != "HEAD" {print "mkdir -p $(TMP)/" $$1 "-" $$2}' versions_map | sh -ex
|
||||||
|
awk '$$3 != "HEAD" {print "git archive " $$3 " " $$1 " | tar -xf- --strip-components=1 -C $(TMP)/" $$1 "-" $$2 }' versions_map | sh -ex
|
||||||
|
helm package -d "$(OUT)" $$(find . $(TMP) -mindepth 2 -maxdepth 2 -name Chart.yaml | awk 'sub("/Chart.yaml", "")' | sort -V)
|
||||||
|
cd "$(OUT)" && helm repo index . --url http://cozystack.cozy-system.svc/repos/apps
|
||||||
|
rm -rf "$(TMP)"
|
||||||
|
|
||||||
fix-chartnames:
|
fix-chartnames:
|
||||||
find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done
|
find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.9.0
|
version: 0.7.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -7,10 +7,8 @@ generate:
|
|||||||
readme-generator -v values.yaml -s values.schema.json -r README.md
|
readme-generator -v values.yaml -s values.schema.json -r README.md
|
||||||
|
|
||||||
image:
|
image:
|
||||||
docker buildx build images/clickhouse-backup \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/clickhouse-backup \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/clickhouse-backup:$(call settag,$(CLICKHOUSE_BACKUP_TAG)) \
|
--tag $(REGISTRY)/clickhouse-backup:$(call settag,$(CLICKHOUSE_BACKUP_TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/clickhouse-backup:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/clickhouse-backup:latest \
|
||||||
--cache-to type=inline \
|
--cache-to type=inline \
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
../../../library/cozy-lib
|
|
||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/clickhouse-backup:0.9.0@sha256:3faf7a4cebf390b9053763107482de175aa0fdb88c1e77424fd81100b1c3a205
|
ghcr.io/cozystack/cozystack/clickhouse-backup:0.7.0@sha256:3faf7a4cebf390b9053763107482de175aa0fdb88c1e77424fd81100b1c3a205
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -122,9 +122,9 @@ spec:
|
|||||||
- name: clickhouse
|
- name: clickhouse
|
||||||
image: clickhouse/clickhouse-server:24.9.2.42
|
image: clickhouse/clickhouse-server:24.9.2.42
|
||||||
{{- if .Values.resources }}
|
{{- if .Values.resources }}
|
||||||
resources: {{- include "cozy-lib.resources.sanitize" .Values.resources | nindent 16 }}
|
resources: {{- toYaml .Values.resources | nindent 16 }}
|
||||||
{{- else if ne .Values.resourcesPreset "none" }}
|
{{- else if ne .Values.resourcesPreset "none" }}
|
||||||
resources: {{- include "cozy-lib.resources.preset" .Values.resourcesPreset | nindent 16 }}
|
resources: {{- include "resources.preset" (dict "type" .Values.resourcesPreset "Release" .Release) | nindent 16 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data-volume-template
|
- name: data-volume-template
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.6.0
|
version: 0.5.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/postgres-backup:0.11.0@sha256:10179ed56457460d95cd5708db2a00130901255fa30c4dd76c65d2ef5622b61f
|
ghcr.io/cozystack/cozystack/postgres-backup:0.10.1@sha256:10179ed56457460d95cd5708db2a00130901255fa30c4dd76c65d2ef5622b61f
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.5.0
|
version: 0.4.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -6,10 +6,8 @@ include ../../../scripts/package.mk
|
|||||||
image: image-nginx
|
image: image-nginx
|
||||||
|
|
||||||
image-nginx:
|
image-nginx:
|
||||||
docker buildx build images/nginx-cache \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/nginx-cache \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/nginx-cache:$(call settag,$(NGINX_CACHE_TAG)) \
|
--tag $(REGISTRY)/nginx-cache:$(call settag,$(NGINX_CACHE_TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/nginx-cache:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/nginx-cache:latest \
|
||||||
--cache-to type=inline \
|
--cache-to type=inline \
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/nginx-cache:0.5.0@sha256:158c35dd6a512bd14e86a423be5c8c7ca91ac71999c73cce2714e4db60a2db43
|
ghcr.io/cozystack/cozystack/nginx-cache:0.4.0@sha256:4e1f5153d2673a399b315252238f4dc3eb5d6c59295aef594691710cc5b72eb4
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:22.04 AS stage
|
FROM ubuntu:22.04 as stage
|
||||||
|
|
||||||
ARG NGINX_VERSION=1.25.3
|
ARG NGINX_VERSION=1.25.3
|
||||||
ARG IP2LOCATION_C_VERSION=8.6.1
|
ARG IP2LOCATION_C_VERSION=8.6.1
|
||||||
@@ -9,15 +9,11 @@ ARG FIFTYONEDEGREES_NGINX_VERSION=3.2.21.1
|
|||||||
ARG NGINX_CACHE_PURGE_VERSION=2.5.3
|
ARG NGINX_CACHE_PURGE_VERSION=2.5.3
|
||||||
ARG NGINX_VTS_VERSION=0.2.2
|
ARG NGINX_VTS_VERSION=0.2.2
|
||||||
|
|
||||||
ARG TARGETOS
|
|
||||||
ARG TARGETARCH
|
|
||||||
|
|
||||||
# Install required packages for development
|
# Install required packages for development
|
||||||
RUN apt update -q \
|
RUN apt-get update -q \
|
||||||
&& apt install -yq --no-install-recommends \
|
&& apt-get install -yq \
|
||||||
ca-certificates \
|
|
||||||
unzip \
|
unzip \
|
||||||
automake \
|
autoconf \
|
||||||
build-essential \
|
build-essential \
|
||||||
libtool \
|
libtool \
|
||||||
libpcre3 \
|
libpcre3 \
|
||||||
@@ -72,7 +68,7 @@ RUN checkinstall \
|
|||||||
--default \
|
--default \
|
||||||
--pkgname=ip2location-c \
|
--pkgname=ip2location-c \
|
||||||
--pkgversion=${IP2LOCATION_C_VERSION} \
|
--pkgversion=${IP2LOCATION_C_VERSION} \
|
||||||
--pkgarch=${TARGETARCH} \
|
--pkgarch=amd64 \
|
||||||
--pkggroup=lib \
|
--pkggroup=lib \
|
||||||
--pkgsource="https://github.com/chrislim2888/IP2Location-C-Library" \
|
--pkgsource="https://github.com/chrislim2888/IP2Location-C-Library" \
|
||||||
--maintainer="Eduard Generalov <eduard@generalov.net>" \
|
--maintainer="Eduard Generalov <eduard@generalov.net>" \
|
||||||
@@ -101,7 +97,7 @@ RUN checkinstall \
|
|||||||
--default \
|
--default \
|
||||||
--pkgname=ip2proxy-c \
|
--pkgname=ip2proxy-c \
|
||||||
--pkgversion=${IP2PROXY_C_VERSION} \
|
--pkgversion=${IP2PROXY_C_VERSION} \
|
||||||
--pkgarch=${TARGETARCH} \
|
--pkgarch=amd64 \
|
||||||
--pkggroup=lib \
|
--pkggroup=lib \
|
||||||
--pkgsource="https://github.com/ip2location/ip2proxy-c" \
|
--pkgsource="https://github.com/ip2location/ip2proxy-c" \
|
||||||
--maintainer="Eduard Generalov <eduard@generalov.net>" \
|
--maintainer="Eduard Generalov <eduard@generalov.net>" \
|
||||||
@@ -148,7 +144,7 @@ RUN checkinstall \
|
|||||||
--default \
|
--default \
|
||||||
--pkgname=nginx \
|
--pkgname=nginx \
|
||||||
--pkgversion=$VERS \
|
--pkgversion=$VERS \
|
||||||
--pkgarch=${TARGETARCH} \
|
--pkgarch=amd64 \
|
||||||
--pkggroup=web \
|
--pkggroup=web \
|
||||||
--provides=nginx \
|
--provides=nginx \
|
||||||
--requires=ip2location-c,ip2proxy-c,libssl3,libc-bin,libc6,libzstd1,libpcre++0v5,libpcre16-3,libpcre2-8-0,libpcre3,libpcre32-3,libpcrecpp0v5,libmaxminddb0 \
|
--requires=ip2location-c,ip2proxy-c,libssl3,libc-bin,libc6,libzstd1,libpcre++0v5,libpcre16-3,libpcre2-8-0,libpcre3,libpcre32-3,libpcrecpp0v5,libmaxminddb0 \
|
||||||
@@ -169,9 +165,10 @@ COPY nginx-reloader.sh /usr/bin/nginx-reloader.sh
|
|||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& groupadd --system --gid 101 nginx \
|
&& groupadd --system --gid 101 nginx \
|
||||||
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
|
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
|
||||||
&& apt update -q \
|
&& apt update \
|
||||||
&& apt install -yq --no-install-recommends --no-install-suggests gnupg1 ca-certificates inotify-tools \
|
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates inotify-tools \
|
||||||
&& apt install -y /packages/*.deb \
|
&& apt -y install /packages/*.deb \
|
||||||
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& mkdir -p /var/lib/nginx /var/log/nginx \
|
&& mkdir -p /var/lib/nginx /var/log/nginx \
|
||||||
&& ln -sf /dev/stdout /var/log/nginx/access.log \
|
&& ln -sf /dev/stdout /var/log/nginx/access.log \
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.6.0
|
version: 0.5.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,10 +16,10 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.20.1
|
version: 0.20.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: 1.32.4
|
appVersion: "1.30.1"
|
||||||
|
|||||||
@@ -14,10 +14,8 @@ generate:
|
|||||||
image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler
|
image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler
|
||||||
|
|
||||||
image-ubuntu-container-disk:
|
image-ubuntu-container-disk:
|
||||||
docker buildx build images/ubuntu-container-disk \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/ubuntu-container-disk \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--build-arg KUBERNETES_VERSION=${KUBERNETES_VERSION} \
|
--build-arg KUBERNETES_VERSION=${KUBERNETES_VERSION} \
|
||||||
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION)) \
|
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION)) \
|
||||||
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION)-$(TAG)) \
|
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION)-$(TAG)) \
|
||||||
@@ -32,10 +30,8 @@ image-ubuntu-container-disk:
|
|||||||
rm -f images/ubuntu-container-disk.json
|
rm -f images/ubuntu-container-disk.json
|
||||||
|
|
||||||
image-kubevirt-cloud-provider:
|
image-kubevirt-cloud-provider:
|
||||||
docker buildx build images/kubevirt-cloud-provider \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/kubevirt-cloud-provider \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/kubevirt-cloud-provider:$(call settag,$(KUBERNETES_PKG_TAG)) \
|
--tag $(REGISTRY)/kubevirt-cloud-provider:$(call settag,$(KUBERNETES_PKG_TAG)) \
|
||||||
--tag $(REGISTRY)/kubevirt-cloud-provider:$(call settag,$(KUBERNETES_PKG_TAG)-$(TAG)) \
|
--tag $(REGISTRY)/kubevirt-cloud-provider:$(call settag,$(KUBERNETES_PKG_TAG)-$(TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/kubevirt-cloud-provider:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/kubevirt-cloud-provider:latest \
|
||||||
@@ -49,10 +45,8 @@ image-kubevirt-cloud-provider:
|
|||||||
rm -f images/kubevirt-cloud-provider.json
|
rm -f images/kubevirt-cloud-provider.json
|
||||||
|
|
||||||
image-kubevirt-csi-driver:
|
image-kubevirt-csi-driver:
|
||||||
docker buildx build images/kubevirt-csi-driver \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/kubevirt-csi-driver \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/kubevirt-csi-driver:$(call settag,$(KUBERNETES_PKG_TAG)) \
|
--tag $(REGISTRY)/kubevirt-csi-driver:$(call settag,$(KUBERNETES_PKG_TAG)) \
|
||||||
--tag $(REGISTRY)/kubevirt-csi-driver:$(call settag,$(KUBERNETES_PKG_TAG)-$(TAG)) \
|
--tag $(REGISTRY)/kubevirt-csi-driver:$(call settag,$(KUBERNETES_PKG_TAG)-$(TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/kubevirt-csi-driver:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/kubevirt-csi-driver:latest \
|
||||||
@@ -67,10 +61,8 @@ image-kubevirt-csi-driver:
|
|||||||
|
|
||||||
|
|
||||||
image-cluster-autoscaler:
|
image-cluster-autoscaler:
|
||||||
docker buildx build images/cluster-autoscaler \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/cluster-autoscaler \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/cluster-autoscaler:$(call settag,$(KUBERNETES_PKG_TAG)) \
|
--tag $(REGISTRY)/cluster-autoscaler:$(call settag,$(KUBERNETES_PKG_TAG)) \
|
||||||
--tag $(REGISTRY)/cluster-autoscaler:$(call settag,$(KUBERNETES_PKG_TAG)-$(TAG)) \
|
--tag $(REGISTRY)/cluster-autoscaler:$(call settag,$(KUBERNETES_PKG_TAG)-$(TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/cluster-autoscaler:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/cluster-autoscaler:latest \
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ kubectl get secret -n <namespace> kubernetes-<clusterName>-admin-kubeconfig -o g
|
|||||||
| `addons.certManager.enabled` | Enables the cert-manager | `false` |
|
| `addons.certManager.enabled` | Enables the cert-manager | `false` |
|
||||||
| `addons.certManager.valuesOverride` | Custom values to override | `{}` |
|
| `addons.certManager.valuesOverride` | Custom values to override | `{}` |
|
||||||
| `addons.cilium.valuesOverride` | Custom values to override | `{}` |
|
| `addons.cilium.valuesOverride` | Custom values to override | `{}` |
|
||||||
| `addons.gatewayAPI.enabled` | Enables the Gateway API | `false` |
|
|
||||||
| `addons.ingressNginx.enabled` | Enable Ingress-NGINX controller (expect nodes with 'ingress-nginx' role) | `false` |
|
| `addons.ingressNginx.enabled` | Enable Ingress-NGINX controller (expect nodes with 'ingress-nginx' role) | `false` |
|
||||||
| `addons.ingressNginx.valuesOverride` | Custom values to override | `{}` |
|
| `addons.ingressNginx.valuesOverride` | Custom values to override | `{}` |
|
||||||
| `addons.ingressNginx.hosts` | List of domain names that should be passed through to the cluster by upper cluster | `[]` |
|
| `addons.ingressNginx.hosts` | List of domain names that should be passed through to the cluster by upper cluster | `[]` |
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/cluster-autoscaler:0.20.1@sha256:720148128917fa10f860a8b7e74f9428de72481c466c880c5ad894e1f0026d43
|
ghcr.io/cozystack/cozystack/cluster-autoscaler:0.19.0@sha256:85371c6aabf5a7fea2214556deac930c600e362f92673464fe2443784e2869c3
|
||||||
|
|||||||
@@ -1,14 +1,7 @@
|
|||||||
# Source: https://raw.githubusercontent.com/kubernetes/autoscaler/refs/heads/master/cluster-autoscaler/Dockerfile.amd64
|
# Source: https://raw.githubusercontent.com/kubernetes/autoscaler/refs/heads/master/cluster-autoscaler/Dockerfile.amd64
|
||||||
ARG builder_image=docker.io/library/golang:1.23.4
|
ARG builder_image=docker.io/library/golang:1.23.4
|
||||||
ARG BASEIMAGE=gcr.io/distroless/static:nonroot-${TARGETARCH}
|
ARG BASEIMAGE=gcr.io/distroless/static:nonroot-amd64
|
||||||
|
|
||||||
FROM ${builder_image} AS builder
|
FROM ${builder_image} AS builder
|
||||||
|
|
||||||
ARG TARGETOS
|
|
||||||
ARG TARGETARCH
|
|
||||||
ENV GOOS=$TARGETOS
|
|
||||||
ENV GOARCH=$TARGETARCH
|
|
||||||
|
|
||||||
RUN git clone https://github.com/kubernetes/autoscaler /src/autoscaler \
|
RUN git clone https://github.com/kubernetes/autoscaler /src/autoscaler \
|
||||||
&& cd /src/autoscaler/cluster-autoscaler \
|
&& cd /src/autoscaler/cluster-autoscaler \
|
||||||
&& git checkout cluster-autoscaler-1.32.0
|
&& git checkout cluster-autoscaler-1.32.0
|
||||||
@@ -21,8 +14,6 @@ RUN make build
|
|||||||
FROM $BASEIMAGE
|
FROM $BASEIMAGE
|
||||||
LABEL maintainer="Marcin Wielgus <mwielgus@google.com>"
|
LABEL maintainer="Marcin Wielgus <mwielgus@google.com>"
|
||||||
|
|
||||||
ARG TARGETARCH
|
COPY --from=builder /src/autoscaler/cluster-autoscaler/cluster-autoscaler-amd64 /cluster-autoscaler
|
||||||
|
|
||||||
COPY --from=builder /src/autoscaler/cluster-autoscaler/cluster-autoscaler-${TARGETARCH} /cluster-autoscaler
|
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
CMD ["/cluster-autoscaler"]
|
CMD ["/cluster-autoscaler"]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.20.1@sha256:1b48a4725a33ccb48604bb2e1be3171271e7daac2726d3119228212d8a9da5bb
|
ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.19.0@sha256:795d8e1ef4b2b0df2aa1e09d96cd13476ebb545b4bf4b5779b7547a70ef64cf9
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
# Source: https://github.com/kubevirt/cloud-provider-kubevirt/blob/main/build/images/kubevirt-cloud-controller-manager/Dockerfile
|
# Source: https://github.com/kubevirt/cloud-provider-kubevirt/blob/main/build/images/kubevirt-cloud-controller-manager/Dockerfile
|
||||||
FROM golang:1.20.6 AS builder
|
FROM --platform=linux/amd64 golang:1.20.6 AS builder
|
||||||
|
|
||||||
ARG TARGETOS
|
|
||||||
ARG TARGETARCH
|
|
||||||
ENV GOOS=$TARGETOS
|
|
||||||
ENV GOARCH=$TARGETARCH
|
|
||||||
|
|
||||||
RUN git clone https://github.com/kubevirt/cloud-provider-kubevirt /go/src/kubevirt.io/cloud-provider-kubevirt \
|
RUN git clone https://github.com/kubevirt/cloud-provider-kubevirt /go/src/kubevirt.io/cloud-provider-kubevirt \
|
||||||
&& cd /go/src/kubevirt.io/cloud-provider-kubevirt \
|
&& cd /go/src/kubevirt.io/cloud-provider-kubevirt \
|
||||||
@@ -19,7 +14,7 @@ RUN go get 'k8s.io/endpointslice/util@v0.28' 'k8s.io/apiserver@v0.28'
|
|||||||
RUN go mod tidy
|
RUN go mod tidy
|
||||||
RUN go mod vendor
|
RUN go mod vendor
|
||||||
|
|
||||||
RUN CGO_ENABLED=0 go build -mod=vendor -ldflags="-s -w" -o bin/kubevirt-cloud-controller-manager ./cmd/kubevirt-cloud-controller-manager
|
RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -ldflags="-s -w" -o bin/kubevirt-cloud-controller-manager ./cmd/kubevirt-cloud-controller-manager
|
||||||
|
|
||||||
FROM registry.access.redhat.com/ubi9/ubi-micro
|
FROM registry.access.redhat.com/ubi9/ubi-micro
|
||||||
COPY --from=builder /go/src/kubevirt.io/cloud-provider-kubevirt/bin/kubevirt-cloud-controller-manager /bin/kubevirt-cloud-controller-manager
|
COPY --from=builder /go/src/kubevirt.io/cloud-provider-kubevirt/bin/kubevirt-cloud-controller-manager /bin/kubevirt-cloud-controller-manager
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.20.1@sha256:fb6d3ce9d6d948285a6d399c852e15259d6922162ec7c44177d2274243f59d1f
|
ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.19.0@sha256:5717919c75e609902c6d67138311a2a8fd07be822e2173f3802b67cf5f3486e9
|
||||||
|
|||||||
@@ -5,11 +5,6 @@ RUN git clone https://github.com/kubevirt/csi-driver /src/kubevirt-csi-driver \
|
|||||||
&& cd /src/kubevirt-csi-driver \
|
&& cd /src/kubevirt-csi-driver \
|
||||||
&& git checkout 35836e0c8b68d9916d29a838ea60cdd3fc6199cf
|
&& git checkout 35836e0c8b68d9916d29a838ea60cdd3fc6199cf
|
||||||
|
|
||||||
ARG TARGETOS
|
|
||||||
ARG TARGETARCH
|
|
||||||
ENV GOOS=$TARGETOS
|
|
||||||
ENV GOARCH=$TARGETARCH
|
|
||||||
|
|
||||||
WORKDIR /src/kubevirt-csi-driver
|
WORKDIR /src/kubevirt-csi-driver
|
||||||
RUN make build
|
RUN make build
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.32@sha256:184b81529ae72684279799b12f436cc7a511d8ff5bd1e9a30478799c7707c625
|
ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.32@sha256:4a4f8bee150e04d1efcd5ff1ea83e12f495a98851cc5fd47ef41ac7aebce9b74
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# TODO: Here we use ubuntu:22.04, as guestfish has some network issues running in ubuntu:24.04
|
# TODO: Here we use ubuntu:22.04, as guestfish has some network issues running in ubuntu:24.04
|
||||||
FROM ubuntu:22.04 AS guestfish
|
FROM ubuntu:22.04 as guestfish
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
@@ -8,17 +8,15 @@ RUN apt-get update \
|
|||||||
linux-image-generic \
|
linux-image-generic \
|
||||||
wget \
|
wget \
|
||||||
make \
|
make \
|
||||||
bash-completion
|
bash-completion \
|
||||||
|
&& apt-get clean
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
FROM guestfish AS builder
|
FROM guestfish as builder
|
||||||
|
|
||||||
ARG TARGETOS
|
|
||||||
ARG TARGETARCH
|
|
||||||
|
|
||||||
# noble is a code name for the Ubuntu 24.04 LTS release
|
# noble is a code name for the Ubuntu 24.04 LTS release
|
||||||
RUN wget -O image.img https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-${TARGETARCH}.img --show-progress --output-file /dev/stdout --progress=dot:giga 2>/dev/null
|
RUN wget -O image.img https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img --show-progress --output-file /dev/stdout --progress=dot:giga 2>/dev/null
|
||||||
|
|
||||||
ARG KUBERNETES_VERSION
|
ARG KUBERNETES_VERSION
|
||||||
|
|
||||||
@@ -31,21 +29,19 @@ RUN qemu-img resize image.img 5G \
|
|||||||
&& guestfish --remote command "resize2fs /dev/sda1" \
|
&& guestfish --remote command "resize2fs /dev/sda1" \
|
||||||
# docker repo
|
# docker repo
|
||||||
&& guestfish --remote sh "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg" \
|
&& guestfish --remote sh "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg" \
|
||||||
&& guestfish --remote sh 'echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list' \
|
&& guestfish --remote sh 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list' \
|
||||||
# kubernetes repo
|
# kubernetes repo
|
||||||
&& guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \
|
&& guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \
|
||||||
&& guestfish --remote sh "echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list" \
|
&& guestfish --remote sh "echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list" \
|
||||||
&& guestfish --remote command "apt-get check -q" \
|
|
||||||
# install containerd
|
# install containerd
|
||||||
&& guestfish --remote command "apt-get update -q" \
|
&& guestfish --remote command "apt-get update -y" \
|
||||||
&& guestfish --remote command "apt-get install -yq containerd.io" \
|
&& guestfish --remote command "apt-get install -y containerd.io" \
|
||||||
# configure containerd
|
# configure containerd
|
||||||
&& guestfish --remote command "mkdir -p /etc/containerd" \
|
&& guestfish --remote command "mkdir -p /etc/containerd" \
|
||||||
&& guestfish --remote sh "containerd config default | tee /etc/containerd/config.toml" \
|
&& guestfish --remote sh "containerd config default | tee /etc/containerd/config.toml" \
|
||||||
&& guestfish --remote command "sed -i '/SystemdCgroup/ s/=.*/= true/' /etc/containerd/config.toml" \
|
&& guestfish --remote command "sed -i '/SystemdCgroup/ s/=.*/= true/' /etc/containerd/config.toml" \
|
||||||
&& guestfish --remote command "containerd config dump >/dev/null" \
|
|
||||||
# install kubernetes
|
# install kubernetes
|
||||||
&& guestfish --remote command "apt-get install -yq kubelet kubeadm" \
|
&& guestfish --remote command "apt-get install -y kubelet kubeadm" \
|
||||||
# clean apt cache
|
# clean apt cache
|
||||||
&& guestfish --remote sh 'apt-get clean && rm -rf /var/lib/apt/lists/*' \
|
&& guestfish --remote sh 'apt-get clean && rm -rf /var/lib/apt/lists/*' \
|
||||||
# write system configuration
|
# write system configuration
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -150,14 +150,14 @@ spec:
|
|||||||
ingress:
|
ingress:
|
||||||
extraAnnotations:
|
extraAnnotations:
|
||||||
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
|
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 }}"
|
className: "{{ $ingress }}"
|
||||||
deployment:
|
deployment:
|
||||||
podAdditionalMetadata:
|
podAdditionalMetadata:
|
||||||
labels:
|
labels:
|
||||||
policy.cozystack.io/allow-to-etcd: "true"
|
policy.cozystack.io/allow-to-etcd: "true"
|
||||||
replicas: 2
|
replicas: 2
|
||||||
version: {{ $.Chart.AppVersion }}
|
version: 1.30.1
|
||||||
---
|
---
|
||||||
apiVersion: cozystack.io/v1alpha1
|
apiVersion: cozystack.io/v1alpha1
|
||||||
kind: WorkloadMonitor
|
kind: WorkloadMonitor
|
||||||
@@ -283,7 +283,7 @@ spec:
|
|||||||
kind: KubevirtMachineTemplate
|
kind: KubevirtMachineTemplate
|
||||||
name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
|
name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
|
||||||
namespace: {{ $.Release.Namespace }}
|
namespace: {{ $.Release.Namespace }}
|
||||||
version: v{{ $.Chart.AppVersion }}
|
version: v1.32.3
|
||||||
---
|
---
|
||||||
apiVersion: cluster.x-k8s.io/v1beta1
|
apiVersion: cluster.x-k8s.io/v1beta1
|
||||||
kind: MachineHealthCheck
|
kind: MachineHealthCheck
|
||||||
|
|||||||
@@ -5,12 +5,6 @@ cilium:
|
|||||||
routingMode: tunnel
|
routingMode: tunnel
|
||||||
enableIPv4Masquerade: true
|
enableIPv4Masquerade: true
|
||||||
ipv4NativeRoutingCIDR: ""
|
ipv4NativeRoutingCIDR: ""
|
||||||
{{- if $.Values.addons.gatewayAPI.enabled }}
|
|
||||||
gatewayAPI:
|
|
||||||
enabled: true
|
|
||||||
envoy:
|
|
||||||
enabled: true
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2
|
apiVersion: helm.toolkit.fluxcd.io/v2
|
||||||
@@ -52,7 +46,3 @@ spec:
|
|||||||
- name: {{ .Release.Name }}
|
- name: {{ .Release.Name }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if $.Values.addons.gatewayAPI.enabled }}
|
|
||||||
- name: {{ .Release.Name }}-gateway-api-crds
|
|
||||||
namespace: {{ .Release.Namespace }}
|
|
||||||
{{- end }}
|
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ spec:
|
|||||||
patch
|
patch
|
||||||
helmrelease
|
helmrelease
|
||||||
{{ .Release.Name }}-cilium
|
{{ .Release.Name }}-cilium
|
||||||
{{ .Release.Name }}-gateway-api-crds
|
|
||||||
{{ .Release.Name }}-csi
|
{{ .Release.Name }}-csi
|
||||||
{{ .Release.Name }}-cert-manager
|
{{ .Release.Name }}-cert-manager
|
||||||
{{ .Release.Name }}-cert-manager-crds
|
{{ .Release.Name }}-cert-manager-crds
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
{{- if $.Values.addons.gatewayAPI.enabled }}
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2
|
|
||||||
kind: HelmRelease
|
|
||||||
metadata:
|
|
||||||
name: {{ .Release.Name }}-gateway-api-crds
|
|
||||||
labels:
|
|
||||||
cozystack.io/repository: system
|
|
||||||
cozystack.io/target-cluster-name: {{ .Release.Name }}
|
|
||||||
spec:
|
|
||||||
interval: 5m
|
|
||||||
releaseName: gateway-api-crds
|
|
||||||
chart:
|
|
||||||
spec:
|
|
||||||
chart: cozy-gateway-api-crds
|
|
||||||
reconcileStrategy: Revision
|
|
||||||
sourceRef:
|
|
||||||
kind: HelmRepository
|
|
||||||
name: cozystack-system
|
|
||||||
namespace: cozy-system
|
|
||||||
kubeConfig:
|
|
||||||
secretRef:
|
|
||||||
name: {{ .Release.Name }}-admin-kubeconfig
|
|
||||||
key: super-admin.svc
|
|
||||||
targetNamespace: kube-system
|
|
||||||
storageNamespace: kube-system
|
|
||||||
install:
|
|
||||||
createNamespace: false
|
|
||||||
remediation:
|
|
||||||
retries: -1
|
|
||||||
upgrade:
|
|
||||||
remediation:
|
|
||||||
retries: -1
|
|
||||||
dependsOn:
|
|
||||||
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
|
|
||||||
- name: {{ .Release.Name }}
|
|
||||||
namespace: {{ .Release.Namespace }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
@@ -6,11 +6,6 @@ ingress-nginx:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
service:
|
service:
|
||||||
enabled: false
|
enabled: false
|
||||||
{{- if not .Values.addons.certManager.enabled }}
|
|
||||||
admissionWebhooks:
|
|
||||||
certManager:
|
|
||||||
enabled: false
|
|
||||||
{{- end }}
|
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
node-role.kubernetes.io/ingress-nginx: ""
|
node-role.kubernetes.io/ingress-nginx: ""
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -155,16 +155,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gatewayAPI": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"enabled": {
|
|
||||||
"type": "boolean",
|
|
||||||
"description": "Enables the Gateway API",
|
|
||||||
"default": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ingressNginx": {
|
"ingressNginx": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|||||||
@@ -48,12 +48,6 @@ addons:
|
|||||||
## @param addons.cilium.valuesOverride Custom values to override
|
## @param addons.cilium.valuesOverride Custom values to override
|
||||||
valuesOverride: {}
|
valuesOverride: {}
|
||||||
|
|
||||||
## Gateway API
|
|
||||||
##
|
|
||||||
gatewayAPI:
|
|
||||||
## @param addons.gatewayAPI.enabled Enables the Gateway API
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
## Ingress-NGINX Controller
|
## Ingress-NGINX Controller
|
||||||
##
|
##
|
||||||
ingressNginx:
|
ingressNginx:
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.7.0
|
version: 0.6.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -7,10 +7,8 @@ generate:
|
|||||||
readme-generator -v values.yaml -s values.schema.json -r README.md
|
readme-generator -v values.yaml -s values.schema.json -r README.md
|
||||||
|
|
||||||
image:
|
image:
|
||||||
docker buildx build images/mariadb-backup \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/mariadb-backup \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/mariadb-backup:$(call settag,$(MARIADB_BACKUP_TAG)) \
|
--tag $(REGISTRY)/mariadb-backup:$(call settag,$(MARIADB_BACKUP_TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/mariadb-backup:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/mariadb-backup:latest \
|
||||||
--cache-to type=inline \
|
--cache-to type=inline \
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/mariadb-backup:0.7.0@sha256:cfd1c37d8ad24e10681d82d6e6ce8a641b4602c1b0ffa8516ae15b4958bb12d4
|
ghcr.io/cozystack/cozystack/mariadb-backup:0.6.0@sha256:cfd1c37d8ad24e10681d82d6e6ce8a641b4602c1b0ffa8516ae15b4958bb12d4
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.6.0
|
version: 0.5.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.11.0
|
version: 0.10.1
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -7,10 +7,8 @@ generate:
|
|||||||
readme-generator -v values.yaml -s values.schema.json -r README.md
|
readme-generator -v values.yaml -s values.schema.json -r README.md
|
||||||
|
|
||||||
image:
|
image:
|
||||||
docker buildx build images/postgres-backup \
|
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/postgres-backup \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/postgres-backup:$(call settag,$(POSTGRES_BACKUP_TAG)) \
|
--tag $(REGISTRY)/postgres-backup:$(call settag,$(POSTGRES_BACKUP_TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/postgres-backup:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/postgres-backup:latest \
|
||||||
--cache-to type=inline \
|
--cache-to type=inline \
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/postgres-backup:0.11.0@sha256:10179ed56457460d95cd5708db2a00130901255fa30c4dd76c65d2ef5622b61f
|
ghcr.io/cozystack/cozystack/postgres-backup:0.10.1@sha256:10179ed56457460d95cd5708db2a00130901255fa30c4dd76c65d2ef5622b61f
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.6.0
|
version: 0.5.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.7.0
|
version: 0.6.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.4.0
|
version: 0.3.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -4,55 +4,36 @@ A tenant is the main unit of security on the platform. The closest analogy would
|
|||||||
|
|
||||||
Tenants can be created recursively and are subject to the following rules:
|
Tenants can be created recursively and are subject to the following rules:
|
||||||
|
|
||||||
### Tenant naming
|
### Higher-level tenants can access lower-level ones.
|
||||||
|
|
||||||
Tenant names must be alphanumeric.
|
Higher-level tenants can view and manage the applications of all their children.
|
||||||
Using dashes (`-`) in tenant names is not allowed, unlike with other services.
|
|
||||||
This limitation exists to keep consistent naming in tenants, nested tenants, and services deployed in them.
|
|
||||||
|
|
||||||
For example:
|
### Each tenant has its own domain
|
||||||
|
|
||||||
- The root tenant is named `root`, but internally it's referenced as `tenant-root`.
|
By default (unless otherwise specified), it inherits the domain of its parent with a prefix of its name, for example, if the parent had the domain `example.org`, then `tenant-foo` would get the domain `foo.example.org` by default.
|
||||||
- A nested tenant could be named `foo`, which would result in `tenant-foo` in service names and URLs.
|
|
||||||
- However, a tenant can not be named `foo-bar`, because parsing names such as `tenant-foo-bar` would be ambiguous.
|
|
||||||
|
|
||||||
### Unique domains
|
|
||||||
|
|
||||||
Each tenant has its own domain.
|
|
||||||
By default, (unless otherwise specified), it inherits the domain of its parent with a prefix of its name.
|
|
||||||
For example, if the parent had the domain `example.org`, then `tenant-foo` would get the domain `foo.example.org` by default.
|
|
||||||
|
|
||||||
Kubernetes clusters created in this tenant namespace would get domains like: `kubernetes-cluster.foo.example.org`
|
Kubernetes clusters created in this tenant namespace would get domains like: `kubernetes-cluster.foo.example.org`
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
```text
|
```
|
||||||
tenant-root (example.org)
|
tenant-root (example.org)
|
||||||
└── tenant-foo (foo.example.org)
|
└── tenant-foo (foo.example.org)
|
||||||
└── kubernetes-cluster1 (kubernetes-cluster1.foo.example.org)
|
└── kubernetes-cluster1 (kubernetes-cluster1.foo.example.org)
|
||||||
```
|
```
|
||||||
|
|
||||||
### Nesting tenants and reusing parent services
|
### Lower-level tenants can access the cluster services of their parent (provided they do not run their own)
|
||||||
|
|
||||||
Tenants can be nested.
|
Thus, you can create `tenant-u1` with a set of services like `etcd`, `ingress`, `monitoring`. And create another tenant namespace `tenant-u2` inside of `tenant-u1`.
|
||||||
A tenant administrator can create nested tenants using the "Tenant" application from the catalogue.
|
|
||||||
|
|
||||||
Higher-level tenants can view and manage the applications of all their children tenants.
|
|
||||||
If a tenant does not run their own cluster services, it can access ones of its parent.
|
|
||||||
|
|
||||||
For example, you create:
|
|
||||||
- Tenant `tenant-u1` with a set of services like `etcd`, `ingress`, `monitoring`.
|
|
||||||
- Tenant `tenant-u2` nested in `tenant-u1`.
|
|
||||||
|
|
||||||
Let's see what will happen when you run Kubernetes and Postgres under `tenant-u2` namespace.
|
Let's see what will happen when you run Kubernetes and Postgres under `tenant-u2` namespace.
|
||||||
|
|
||||||
Since `tenant-u2` does not have its own cluster services like `etcd`, `ingress`, and `monitoring`,
|
Since `tenant-u2` does not have its own cluster services like `etcd`, `ingress`, and `monitoring`, the applications will use the cluster services of the parent tenant.
|
||||||
the applications running in `tenant-u2` will use the cluster services of the parent tenant.
|
|
||||||
|
|
||||||
This in turn means:
|
This in turn means:
|
||||||
|
|
||||||
- The Kubernetes cluster data will be stored in `etcd` for `tenant-u1`.
|
- The Kubernetes cluster data will be stored in etcd for `tenant-u1`.
|
||||||
- Access to the cluster will be through the common `ingress` of `tenant-u1`.
|
- Access to the cluster will be through the common ingress of `tenant-u1`.
|
||||||
- Essentially, all metrics will be collected in the `monitoring` from `tenant-u1`, and only that tenant will have access to them.
|
- Essentially, all metrics will be collected in the monitoring from `tenant-u1`, and only it will have access to them.
|
||||||
|
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -8,8 +8,7 @@ clickhouse 0.5.0 0f312d5c
|
|||||||
clickhouse 0.6.0 1ec10165
|
clickhouse 0.6.0 1ec10165
|
||||||
clickhouse 0.6.1 c62a83a7
|
clickhouse 0.6.1 c62a83a7
|
||||||
clickhouse 0.6.2 8267072d
|
clickhouse 0.6.2 8267072d
|
||||||
clickhouse 0.7.0 93bdf411
|
clickhouse 0.7.0 HEAD
|
||||||
clickhouse 0.9.0 HEAD
|
|
||||||
ferretdb 0.1.0 e9716091
|
ferretdb 0.1.0 e9716091
|
||||||
ferretdb 0.1.1 91b0499a
|
ferretdb 0.1.1 91b0499a
|
||||||
ferretdb 0.2.0 6c5cf5bf
|
ferretdb 0.2.0 6c5cf5bf
|
||||||
@@ -17,14 +16,12 @@ ferretdb 0.3.0 b8e33d19
|
|||||||
ferretdb 0.4.0 b40e1b09
|
ferretdb 0.4.0 b40e1b09
|
||||||
ferretdb 0.4.1 1ec10165
|
ferretdb 0.4.1 1ec10165
|
||||||
ferretdb 0.4.2 8267072d
|
ferretdb 0.4.2 8267072d
|
||||||
ferretdb 0.5.0 93bdf411
|
ferretdb 0.5.0 HEAD
|
||||||
ferretdb 0.6.0 HEAD
|
|
||||||
http-cache 0.1.0 263e47be
|
http-cache 0.1.0 263e47be
|
||||||
http-cache 0.2.0 53f2365e
|
http-cache 0.2.0 53f2365e
|
||||||
http-cache 0.3.0 6c5cf5bf
|
http-cache 0.3.0 6c5cf5bf
|
||||||
http-cache 0.3.1 0f312d5c
|
http-cache 0.3.1 0f312d5c
|
||||||
http-cache 0.4.0 93bdf411
|
http-cache 0.4.0 HEAD
|
||||||
http-cache 0.5.0 HEAD
|
|
||||||
kafka 0.1.0 f7eaab0a
|
kafka 0.1.0 f7eaab0a
|
||||||
kafka 0.2.0 c0685f43
|
kafka 0.2.0 c0685f43
|
||||||
kafka 0.2.1 dfbc210b
|
kafka 0.2.1 dfbc210b
|
||||||
@@ -35,8 +32,7 @@ kafka 0.3.1 c62a83a7
|
|||||||
kafka 0.3.2 93c46161
|
kafka 0.3.2 93c46161
|
||||||
kafka 0.3.3 8267072d
|
kafka 0.3.3 8267072d
|
||||||
kafka 0.4.0 85ec09b8
|
kafka 0.4.0 85ec09b8
|
||||||
kafka 0.5.0 93bdf411
|
kafka 0.5.0 HEAD
|
||||||
kafka 0.6.0 HEAD
|
|
||||||
kubernetes 0.1.0 263e47be
|
kubernetes 0.1.0 263e47be
|
||||||
kubernetes 0.2.0 53f2365e
|
kubernetes 0.2.0 53f2365e
|
||||||
kubernetes 0.3.0 007d414f
|
kubernetes 0.3.0 007d414f
|
||||||
@@ -64,8 +60,7 @@ kubernetes 0.17.0 1fbbfcd0
|
|||||||
kubernetes 0.17.1 fd240701
|
kubernetes 0.17.1 fd240701
|
||||||
kubernetes 0.18.0 721c12a7
|
kubernetes 0.18.0 721c12a7
|
||||||
kubernetes 0.19.0 93bdf411
|
kubernetes 0.19.0 93bdf411
|
||||||
kubernetes 0.20.0 609e7ede
|
kubernetes 0.20.0 HEAD
|
||||||
kubernetes 0.20.1 HEAD
|
|
||||||
mysql 0.1.0 263e47be
|
mysql 0.1.0 263e47be
|
||||||
mysql 0.2.0 c24a103f
|
mysql 0.2.0 c24a103f
|
||||||
mysql 0.3.0 53f2365e
|
mysql 0.3.0 53f2365e
|
||||||
@@ -74,16 +69,14 @@ mysql 0.5.0 b40e1b09
|
|||||||
mysql 0.5.1 0f312d5c
|
mysql 0.5.1 0f312d5c
|
||||||
mysql 0.5.2 1ec10165
|
mysql 0.5.2 1ec10165
|
||||||
mysql 0.5.3 8267072d
|
mysql 0.5.3 8267072d
|
||||||
mysql 0.6.0 93bdf411
|
mysql 0.6.0 HEAD
|
||||||
mysql 0.7.0 HEAD
|
|
||||||
nats 0.1.0 e9716091
|
nats 0.1.0 e9716091
|
||||||
nats 0.2.0 6c5cf5bf
|
nats 0.2.0 6c5cf5bf
|
||||||
nats 0.3.0 78366f19
|
nats 0.3.0 78366f19
|
||||||
nats 0.3.1 c62a83a7
|
nats 0.3.1 c62a83a7
|
||||||
nats 0.4.0 898374b5
|
nats 0.4.0 898374b5
|
||||||
nats 0.4.1 8267072d
|
nats 0.4.1 8267072d
|
||||||
nats 0.5.0 93bdf411
|
nats 0.5.0 HEAD
|
||||||
nats 0.6.0 HEAD
|
|
||||||
postgres 0.1.0 263e47be
|
postgres 0.1.0 263e47be
|
||||||
postgres 0.2.0 53f2365e
|
postgres 0.2.0 53f2365e
|
||||||
postgres 0.2.1 d7cfa53c
|
postgres 0.2.1 d7cfa53c
|
||||||
@@ -98,8 +91,7 @@ postgres 0.7.1 1ec10165
|
|||||||
postgres 0.8.0 4e68e65c
|
postgres 0.8.0 4e68e65c
|
||||||
postgres 0.9.0 8267072d
|
postgres 0.9.0 8267072d
|
||||||
postgres 0.10.0 721c12a7
|
postgres 0.10.0 721c12a7
|
||||||
postgres 0.10.1 93bdf411
|
postgres 0.10.1 HEAD
|
||||||
postgres 0.11.0 HEAD
|
|
||||||
rabbitmq 0.1.0 263e47be
|
rabbitmq 0.1.0 263e47be
|
||||||
rabbitmq 0.2.0 53f2365e
|
rabbitmq 0.2.0 53f2365e
|
||||||
rabbitmq 0.3.0 6c5cf5bf
|
rabbitmq 0.3.0 6c5cf5bf
|
||||||
@@ -108,20 +100,17 @@ rabbitmq 0.4.1 1128d0cb
|
|||||||
rabbitmq 0.4.2 4b90bf5a
|
rabbitmq 0.4.2 4b90bf5a
|
||||||
rabbitmq 0.4.3 1ec10165
|
rabbitmq 0.4.3 1ec10165
|
||||||
rabbitmq 0.4.4 8267072d
|
rabbitmq 0.4.4 8267072d
|
||||||
rabbitmq 0.5.0 93bdf411
|
rabbitmq 0.5.0 HEAD
|
||||||
rabbitmq 0.6.0 HEAD
|
|
||||||
redis 0.1.1 263e47be
|
redis 0.1.1 263e47be
|
||||||
redis 0.2.0 53f2365e
|
redis 0.2.0 53f2365e
|
||||||
redis 0.3.0 6c5cf5bf
|
redis 0.3.0 6c5cf5bf
|
||||||
redis 0.3.1 c62a83a7
|
redis 0.3.1 c62a83a7
|
||||||
redis 0.4.0 84f3ccc0
|
redis 0.4.0 84f3ccc0
|
||||||
redis 0.5.0 4e68e65c
|
redis 0.5.0 4e68e65c
|
||||||
redis 0.6.0 93bdf411
|
redis 0.6.0 HEAD
|
||||||
redis 0.7.0 HEAD
|
|
||||||
tcp-balancer 0.1.0 263e47be
|
tcp-balancer 0.1.0 263e47be
|
||||||
tcp-balancer 0.2.0 53f2365e
|
tcp-balancer 0.2.0 53f2365e
|
||||||
tcp-balancer 0.3.0 93bdf411
|
tcp-balancer 0.3.0 HEAD
|
||||||
tcp-balancer 0.4.0 HEAD
|
|
||||||
tenant 0.1.4 afc997ef
|
tenant 0.1.4 afc997ef
|
||||||
tenant 0.1.5 e3ab858a
|
tenant 0.1.5 e3ab858a
|
||||||
tenant 1.0.0 263e47be
|
tenant 1.0.0 263e47be
|
||||||
@@ -158,8 +147,7 @@ virtual-machine 0.8.0 3fa4dd3a
|
|||||||
virtual-machine 0.8.1 93c46161
|
virtual-machine 0.8.1 93c46161
|
||||||
virtual-machine 0.8.2 de19450f
|
virtual-machine 0.8.2 de19450f
|
||||||
virtual-machine 0.9.0 721c12a7
|
virtual-machine 0.9.0 721c12a7
|
||||||
virtual-machine 0.9.1 93bdf411
|
virtual-machine 0.9.1 HEAD
|
||||||
virtual-machine 0.10.0 HEAD
|
|
||||||
vm-disk 0.1.0 d971f2ff
|
vm-disk 0.1.0 d971f2ff
|
||||||
vm-disk 0.1.1 HEAD
|
vm-disk 0.1.1 HEAD
|
||||||
vm-instance 0.1.0 1ec10165
|
vm-instance 0.1.0 1ec10165
|
||||||
@@ -170,10 +158,9 @@ vm-instance 0.4.1 0ab39f20
|
|||||||
vm-instance 0.5.0 3fa4dd3a
|
vm-instance 0.5.0 3fa4dd3a
|
||||||
vm-instance 0.5.1 de19450f
|
vm-instance 0.5.1 de19450f
|
||||||
vm-instance 0.6.0 721c12a7
|
vm-instance 0.6.0 721c12a7
|
||||||
vm-instance 0.7.0 HEAD
|
vm-instance 0.6.1 HEAD
|
||||||
vpn 0.1.0 263e47be
|
vpn 0.1.0 263e47be
|
||||||
vpn 0.2.0 53f2365e
|
vpn 0.2.0 53f2365e
|
||||||
vpn 0.3.0 6c5cf5bf
|
vpn 0.3.0 6c5cf5bf
|
||||||
vpn 0.3.1 1ec10165
|
vpn 0.3.1 1ec10165
|
||||||
vpn 0.4.0 93bdf411
|
vpn 0.4.0 HEAD
|
||||||
vpn 0.5.0 HEAD
|
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.10.0
|
version: 0.9.1
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: 0.10.0
|
appVersion: 0.9.0
|
||||||
|
|||||||
@@ -9,4 +9,4 @@ generate:
|
|||||||
&& yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json
|
&& yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json
|
||||||
yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json
|
yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json
|
||||||
yq -i -o json '.properties.systemDisk.properties.image.enum = ["ubuntu", "cirros", "alpine", "fedora", "talos"]' values.schema.json
|
yq -i -o json '.properties.systemDisk.properties.image.enum = ["ubuntu", "cirros", "alpine", "fedora", "talos"]' values.schema.json
|
||||||
yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json
|
yq -i -o json '.properties.externalMethod.enum = ["WholeIP", "PortList"]' values.schema.json
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ virtctl ssh <user>@<vm>
|
|||||||
| Name | Description | Value |
|
| Name | Description | Value |
|
||||||
| ------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------ |
|
| ------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------ |
|
||||||
| `external` | Enable external access from outside the cluster | `false` |
|
| `external` | Enable external access from outside the cluster | `false` |
|
||||||
| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList` |
|
| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `WholeIP` |
|
||||||
| `externalPorts` | Specify ports to forward from outside the cluster | `[]` |
|
| `externalPorts` | Specify ports to forward from outside the cluster | `[]` |
|
||||||
| `running` | Determines if the virtual machine should be running | `true` |
|
| `running` | Determines if the virtual machine should be running | `true` |
|
||||||
| `instanceType` | Virtual Machine instance type | `u1.medium` |
|
| `instanceType` | Virtual Machine instance type | `u1.medium` |
|
||||||
|
|||||||
@@ -27,7 +27,10 @@ spec:
|
|||||||
- metadata:
|
- metadata:
|
||||||
name: {{ include "virtual-machine.fullname" . }}
|
name: {{ include "virtual-machine.fullname" . }}
|
||||||
spec:
|
spec:
|
||||||
storage:
|
pvc:
|
||||||
|
volumeMode: Block
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteMany
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: {{ .Values.systemDisk.storage | quote }}
|
storage: {{ .Values.systemDisk.storage | quote }}
|
||||||
|
|||||||
@@ -10,10 +10,10 @@
|
|||||||
"externalMethod": {
|
"externalMethod": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`",
|
"description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`",
|
||||||
"default": "PortList",
|
"default": "WholeIP",
|
||||||
"enum": [
|
"enum": [
|
||||||
"PortList",
|
"WholeIP",
|
||||||
"WholeIP"
|
"PortList"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"externalPorts": {
|
"externalPorts": {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`
|
## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`
|
||||||
## @param externalPorts [array] Specify ports to forward from outside the cluster
|
## @param externalPorts [array] Specify ports to forward from outside the cluster
|
||||||
external: false
|
external: false
|
||||||
externalMethod: PortList
|
externalMethod: WholeIP
|
||||||
externalPorts:
|
externalPorts:
|
||||||
- 22
|
- 22
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.7.0
|
version: 0.6.1
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: 0.7.0
|
appVersion: 0.6.0
|
||||||
|
|||||||
@@ -9,4 +9,4 @@ generate:
|
|||||||
PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \
|
PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \
|
||||||
&& yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json
|
&& yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json
|
||||||
yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json
|
yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json
|
||||||
yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json
|
yq -i -o json '.properties.externalMethod.enum = ["WholeIP", "PortList"]' values.schema.json
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ virtctl ssh <user>@<vm>
|
|||||||
| Name | Description | Value |
|
| Name | Description | Value |
|
||||||
| ------------------ | ---------------------------------------------------------------------------------------------------------- | ----------- |
|
| ------------------ | ---------------------------------------------------------------------------------------------------------- | ----------- |
|
||||||
| `external` | Enable external access from outside the cluster | `false` |
|
| `external` | Enable external access from outside the cluster | `false` |
|
||||||
| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList` |
|
| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `WholeIP` |
|
||||||
| `externalPorts` | Specify ports to forward from outside the cluster | `[]` |
|
| `externalPorts` | Specify ports to forward from outside the cluster | `[]` |
|
||||||
| `running` | Determines if the virtual machine should be running | `true` |
|
| `running` | Determines if the virtual machine should be running | `true` |
|
||||||
| `instanceType` | Virtual Machine instance type | `u1.medium` |
|
| `instanceType` | Virtual Machine instance type | `u1.medium` |
|
||||||
|
|||||||
@@ -10,10 +10,10 @@
|
|||||||
"externalMethod": {
|
"externalMethod": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`",
|
"description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`",
|
||||||
"default": "PortList",
|
"default": "WholeIP",
|
||||||
"enum": [
|
"enum": [
|
||||||
"PortList",
|
"WholeIP",
|
||||||
"WholeIP"
|
"PortList"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"externalPorts": {
|
"externalPorts": {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`
|
## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`
|
||||||
## @param externalPorts [array] Specify ports to forward from outside the cluster
|
## @param externalPorts [array] Specify ports to forward from outside the cluster
|
||||||
external: false
|
external: false
|
||||||
externalMethod: PortList
|
externalMethod: WholeIP
|
||||||
externalPorts:
|
externalPorts:
|
||||||
- 22
|
- 22
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.5.0
|
version: 0.4.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|||||||
@@ -11,34 +11,35 @@ These presets are for basic testing and not meant to be used in production
|
|||||||
{{ include "resources.preset" (dict "type" "nano") -}}
|
{{ include "resources.preset" (dict "type" "nano") -}}
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "resources.preset" -}}
|
{{- define "resources.preset" -}}
|
||||||
|
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
|
||||||
{{- $presets := dict
|
{{- $presets := dict
|
||||||
"nano" (dict
|
"nano" (dict
|
||||||
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"micro" (dict
|
"micro" (dict
|
||||||
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"small" (dict
|
"small" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"medium" (dict
|
"medium" (dict
|
||||||
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"large" (dict
|
"large" (dict
|
||||||
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"xlarge" (dict
|
"xlarge" (dict
|
||||||
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
"2xlarge" (dict
|
"2xlarge" (dict
|
||||||
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
|
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
|
||||||
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
|
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
{{- if hasKey $presets .type -}}
|
{{- if hasKey $presets .type -}}
|
||||||
|
|||||||
@@ -3,24 +3,24 @@
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
platform: metal
|
platform: metal
|
||||||
secureboot: false
|
secureboot: false
|
||||||
version: v1.10.1
|
version: v1.9.5
|
||||||
input:
|
input:
|
||||||
kernel:
|
kernel:
|
||||||
path: /usr/install/amd64/vmlinuz
|
path: /usr/install/amd64/vmlinuz
|
||||||
initramfs:
|
initramfs:
|
||||||
path: /usr/install/amd64/initramfs.xz
|
path: /usr/install/amd64/initramfs.xz
|
||||||
baseInstaller:
|
baseInstaller:
|
||||||
imageRef: ghcr.io/siderolabs/installer:v1.10.1
|
imageRef: ghcr.io/siderolabs/installer:v1.9.5
|
||||||
systemExtensions:
|
systemExtensions:
|
||||||
- imageRef: ghcr.io/siderolabs/amd-ucode:20250410
|
- imageRef: ghcr.io/siderolabs/amd-ucode:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250410
|
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
||||||
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/drbd:9.2.13-v1.10.1
|
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.5
|
||||||
- imageRef: ghcr.io/siderolabs/zfs:2.3.1-v1.10.1
|
- imageRef: ghcr.io/siderolabs/zfs:2.2.7-v1.9.5
|
||||||
output:
|
output:
|
||||||
kind: initramfs
|
kind: initramfs
|
||||||
imageOptions: {}
|
imageOptions: {}
|
||||||
|
|||||||
@@ -3,24 +3,24 @@
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
platform: metal
|
platform: metal
|
||||||
secureboot: false
|
secureboot: false
|
||||||
version: v1.10.1
|
version: v1.9.5
|
||||||
input:
|
input:
|
||||||
kernel:
|
kernel:
|
||||||
path: /usr/install/amd64/vmlinuz
|
path: /usr/install/amd64/vmlinuz
|
||||||
initramfs:
|
initramfs:
|
||||||
path: /usr/install/amd64/initramfs.xz
|
path: /usr/install/amd64/initramfs.xz
|
||||||
baseInstaller:
|
baseInstaller:
|
||||||
imageRef: ghcr.io/siderolabs/installer:v1.10.1
|
imageRef: ghcr.io/siderolabs/installer:v1.9.5
|
||||||
systemExtensions:
|
systemExtensions:
|
||||||
- imageRef: ghcr.io/siderolabs/amd-ucode:20250410
|
- imageRef: ghcr.io/siderolabs/amd-ucode:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250410
|
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
||||||
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/drbd:9.2.13-v1.10.1
|
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.5
|
||||||
- imageRef: ghcr.io/siderolabs/zfs:2.3.1-v1.10.1
|
- imageRef: ghcr.io/siderolabs/zfs:2.2.7-v1.9.5
|
||||||
output:
|
output:
|
||||||
kind: installer
|
kind: installer
|
||||||
imageOptions: {}
|
imageOptions: {}
|
||||||
|
|||||||
@@ -3,24 +3,24 @@
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
platform: metal
|
platform: metal
|
||||||
secureboot: false
|
secureboot: false
|
||||||
version: v1.10.1
|
version: v1.9.5
|
||||||
input:
|
input:
|
||||||
kernel:
|
kernel:
|
||||||
path: /usr/install/amd64/vmlinuz
|
path: /usr/install/amd64/vmlinuz
|
||||||
initramfs:
|
initramfs:
|
||||||
path: /usr/install/amd64/initramfs.xz
|
path: /usr/install/amd64/initramfs.xz
|
||||||
baseInstaller:
|
baseInstaller:
|
||||||
imageRef: ghcr.io/siderolabs/installer:v1.10.1
|
imageRef: ghcr.io/siderolabs/installer:v1.9.5
|
||||||
systemExtensions:
|
systemExtensions:
|
||||||
- imageRef: ghcr.io/siderolabs/amd-ucode:20250410
|
- imageRef: ghcr.io/siderolabs/amd-ucode:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250410
|
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
||||||
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/drbd:9.2.13-v1.10.1
|
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.5
|
||||||
- imageRef: ghcr.io/siderolabs/zfs:2.3.1-v1.10.1
|
- imageRef: ghcr.io/siderolabs/zfs:2.2.7-v1.9.5
|
||||||
output:
|
output:
|
||||||
kind: iso
|
kind: iso
|
||||||
imageOptions: {}
|
imageOptions: {}
|
||||||
|
|||||||
@@ -3,24 +3,24 @@
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
platform: metal
|
platform: metal
|
||||||
secureboot: false
|
secureboot: false
|
||||||
version: v1.10.1
|
version: v1.9.5
|
||||||
input:
|
input:
|
||||||
kernel:
|
kernel:
|
||||||
path: /usr/install/amd64/vmlinuz
|
path: /usr/install/amd64/vmlinuz
|
||||||
initramfs:
|
initramfs:
|
||||||
path: /usr/install/amd64/initramfs.xz
|
path: /usr/install/amd64/initramfs.xz
|
||||||
baseInstaller:
|
baseInstaller:
|
||||||
imageRef: ghcr.io/siderolabs/installer:v1.10.1
|
imageRef: ghcr.io/siderolabs/installer:v1.9.5
|
||||||
systemExtensions:
|
systemExtensions:
|
||||||
- imageRef: ghcr.io/siderolabs/amd-ucode:20250410
|
- imageRef: ghcr.io/siderolabs/amd-ucode:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250410
|
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
||||||
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/drbd:9.2.13-v1.10.1
|
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.5
|
||||||
- imageRef: ghcr.io/siderolabs/zfs:2.3.1-v1.10.1
|
- imageRef: ghcr.io/siderolabs/zfs:2.2.7-v1.9.5
|
||||||
output:
|
output:
|
||||||
kind: kernel
|
kind: kernel
|
||||||
imageOptions: {}
|
imageOptions: {}
|
||||||
|
|||||||
@@ -3,24 +3,24 @@
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
platform: metal
|
platform: metal
|
||||||
secureboot: false
|
secureboot: false
|
||||||
version: v1.10.1
|
version: v1.9.5
|
||||||
input:
|
input:
|
||||||
kernel:
|
kernel:
|
||||||
path: /usr/install/amd64/vmlinuz
|
path: /usr/install/amd64/vmlinuz
|
||||||
initramfs:
|
initramfs:
|
||||||
path: /usr/install/amd64/initramfs.xz
|
path: /usr/install/amd64/initramfs.xz
|
||||||
baseInstaller:
|
baseInstaller:
|
||||||
imageRef: ghcr.io/siderolabs/installer:v1.10.1
|
imageRef: ghcr.io/siderolabs/installer:v1.9.5
|
||||||
systemExtensions:
|
systemExtensions:
|
||||||
- imageRef: ghcr.io/siderolabs/amd-ucode:20250410
|
- imageRef: ghcr.io/siderolabs/amd-ucode:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250410
|
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
||||||
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/drbd:9.2.13-v1.10.1
|
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.5
|
||||||
- imageRef: ghcr.io/siderolabs/zfs:2.3.1-v1.10.1
|
- imageRef: ghcr.io/siderolabs/zfs:2.2.7-v1.9.5
|
||||||
output:
|
output:
|
||||||
kind: image
|
kind: image
|
||||||
imageOptions: { diskSize: 1306525696, diskFormat: raw }
|
imageOptions: { diskSize: 1306525696, diskFormat: raw }
|
||||||
|
|||||||
@@ -3,24 +3,24 @@
|
|||||||
arch: amd64
|
arch: amd64
|
||||||
platform: nocloud
|
platform: nocloud
|
||||||
secureboot: false
|
secureboot: false
|
||||||
version: v1.10.1
|
version: v1.9.5
|
||||||
input:
|
input:
|
||||||
kernel:
|
kernel:
|
||||||
path: /usr/install/amd64/vmlinuz
|
path: /usr/install/amd64/vmlinuz
|
||||||
initramfs:
|
initramfs:
|
||||||
path: /usr/install/amd64/initramfs.xz
|
path: /usr/install/amd64/initramfs.xz
|
||||||
baseInstaller:
|
baseInstaller:
|
||||||
imageRef: ghcr.io/siderolabs/installer:v1.10.1
|
imageRef: ghcr.io/siderolabs/installer:v1.9.5
|
||||||
systemExtensions:
|
systemExtensions:
|
||||||
- imageRef: ghcr.io/siderolabs/amd-ucode:20250410
|
- imageRef: ghcr.io/siderolabs/amd-ucode:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250410
|
- imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
- imageRef: ghcr.io/siderolabs/i915-ucode:20241110
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
- imageRef: ghcr.io/siderolabs/intel-ucode:20250211
|
||||||
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250410
|
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20250311
|
||||||
- imageRef: ghcr.io/siderolabs/drbd:9.2.13-v1.10.1
|
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.5
|
||||||
- imageRef: ghcr.io/siderolabs/zfs:2.3.1-v1.10.1
|
- imageRef: ghcr.io/siderolabs/zfs:2.2.7-v1.9.5
|
||||||
output:
|
output:
|
||||||
kind: image
|
kind: image
|
||||||
imageOptions: { diskSize: 1306525696, diskFormat: raw }
|
imageOptions: { diskSize: 1306525696, diskFormat: raw }
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
cozystack:
|
cozystack:
|
||||||
image: ghcr.io/cozystack/cozystack/installer:v0.31.0-rc.3@sha256:5fc6b88de670878b66f2b5bf381b89b68253ab3e69ff1cb7359470bc65beb3fa
|
image: ghcr.io/cozystack/cozystack/installer:v0.31.0-rc.1@sha256:ab0e8fd97632ba784a42a3d0714806ea327440f82ffa5c4896a87c5fb7c1ec6e
|
||||||
|
|||||||
@@ -260,16 +260,68 @@ releases:
|
|||||||
releaseName: dashboard
|
releaseName: dashboard
|
||||||
chart: cozy-dashboard
|
chart: cozy-dashboard
|
||||||
namespace: cozy-dashboard
|
namespace: cozy-dashboard
|
||||||
|
dependsOn: [cilium,kubeovn,keycloak-configure]
|
||||||
values:
|
values:
|
||||||
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
|
kubeapps:
|
||||||
{{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig | fromYaml }}
|
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
|
||||||
{{- toYaml (deepCopy $dashboardKCValues | mergeOverwrite (fromYaml (include "cozystack.defaultDashboardValues" .))) | nindent 4 }}
|
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
|
||||||
dependsOn:
|
redis:
|
||||||
- cilium
|
master:
|
||||||
- kubeovn
|
podAnnotations:
|
||||||
{{- if eq $oidcEnabled "true" }}
|
{{- range $index, $repo := . }}
|
||||||
- keycloak-configure
|
{{- with (($repo.status).artifact).revision }}
|
||||||
|
repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
frontend:
|
||||||
|
resourcesPreset: "none"
|
||||||
|
dashboard:
|
||||||
|
resourcesPreset: "none"
|
||||||
|
{{- $cozystackBranding:= lookup "v1" "ConfigMap" "cozy-system" "cozystack-branding" }}
|
||||||
|
{{- $branding := dig "data" "branding" "" $cozystackBranding }}
|
||||||
|
{{- if $branding }}
|
||||||
|
customLocale:
|
||||||
|
"Kubeapps": {{ $branding }}
|
||||||
|
{{- end }}
|
||||||
|
customStyle: |
|
||||||
|
{{- $logoImage := dig "data" "logo" "" $cozystackBranding }}
|
||||||
|
{{- if $logoImage }}
|
||||||
|
.kubeapps-logo {
|
||||||
|
background-image: {{ $logoImage }}
|
||||||
|
}
|
||||||
|
{{- end }}
|
||||||
|
#serviceaccount-selector {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.login-moreinfo {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
a[href="#/docs"] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.login-group .clr-form-control .clr-control-label {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.appview-separator div.appview-first-row div.center {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.appview-separator div.appview-first-row section[aria-labelledby="app-secrets"] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.appview-first-row section[aria-labelledby="access-urls-title"] {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
|
||||||
|
{{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }}
|
||||||
|
{{- if $dashboardKCValues }}
|
||||||
|
valuesFrom:
|
||||||
|
- kind: ConfigMap
|
||||||
|
name: kubeapps-auth-config
|
||||||
|
valuesKey: values.yaml
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
dependsOn: [keycloak-configure]
|
||||||
|
|
||||||
- name: kamaji
|
- name: kamaji
|
||||||
releaseName: kamaji
|
releaseName: kamaji
|
||||||
|
|||||||
@@ -155,9 +155,66 @@ releases:
|
|||||||
chart: cozy-dashboard
|
chart: cozy-dashboard
|
||||||
namespace: cozy-dashboard
|
namespace: cozy-dashboard
|
||||||
values:
|
values:
|
||||||
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
|
kubeapps:
|
||||||
{{- $dashboardKCValues := dig "data" "values.yaml" (dict) $dashboardKCconfig }}
|
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
|
||||||
{{- toYaml (deepCopy $dashboardKCValues | mergeOverwrite (fromYaml (include "cozystack.defaultDashboardValues" .))) | nindent 4 }}
|
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
|
||||||
|
redis:
|
||||||
|
master:
|
||||||
|
podAnnotations:
|
||||||
|
{{- range $index, $repo := . }}
|
||||||
|
{{- with (($repo.status).artifact).revision }}
|
||||||
|
repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
frontend:
|
||||||
|
resourcesPreset: "none"
|
||||||
|
dashboard:
|
||||||
|
resourcesPreset: "none"
|
||||||
|
{{- $cozystackBranding:= lookup "v1" "ConfigMap" "cozy-system" "cozystack-branding" }}
|
||||||
|
{{- $branding := dig "data" "branding" "" $cozystackBranding }}
|
||||||
|
{{- if $branding }}
|
||||||
|
customLocale:
|
||||||
|
"Kubeapps": {{ $branding }}
|
||||||
|
{{- end }}
|
||||||
|
customStyle: |
|
||||||
|
{{- $logoImage := dig "data" "logo" "" $cozystackBranding }}
|
||||||
|
{{- if $logoImage }}
|
||||||
|
.kubeapps-logo {
|
||||||
|
background-image: {{ $logoImage }}
|
||||||
|
}
|
||||||
|
{{- end }}
|
||||||
|
#serviceaccount-selector {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.login-moreinfo {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
a[href="#/docs"] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.login-group .clr-form-control .clr-control-label {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.appview-separator div.appview-first-row div.center {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.appview-separator div.appview-first-row section[aria-labelledby="app-secrets"] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.appview-first-row section[aria-labelledby="access-urls-title"] {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
|
||||||
|
{{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }}
|
||||||
|
{{- if $dashboardKCValues }}
|
||||||
|
valuesFrom:
|
||||||
|
- kind: ConfigMap
|
||||||
|
name: kubeapps-auth-config
|
||||||
|
valuesKey: values.yaml
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
{{- if eq $oidcEnabled "true" }}
|
{{- if eq $oidcEnabled "true" }}
|
||||||
dependsOn: [keycloak-configure]
|
dependsOn: [keycloak-configure]
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
|||||||
@@ -16,57 +16,3 @@ Get IP-addresses of master nodes
|
|||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{ join "," $ips }}
|
{{ join "," $ips }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{- define "cozystack.defaultDashboardValues" -}}
|
|
||||||
kubeapps:
|
|
||||||
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
|
|
||||||
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
|
|
||||||
redis:
|
|
||||||
master:
|
|
||||||
podAnnotations:
|
|
||||||
{{- range $index, $repo := . }}
|
|
||||||
{{- with (($repo.status).artifact).revision }}
|
|
||||||
repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
frontend:
|
|
||||||
resourcesPreset: "none"
|
|
||||||
dashboard:
|
|
||||||
resourcesPreset: "none"
|
|
||||||
{{- $cozystackBranding:= lookup "v1" "ConfigMap" "cozy-system" "cozystack-branding" }}
|
|
||||||
{{- $branding := dig "data" "branding" "" $cozystackBranding }}
|
|
||||||
{{- if $branding }}
|
|
||||||
customLocale:
|
|
||||||
"Kubeapps": {{ $branding }}
|
|
||||||
{{- end }}
|
|
||||||
customStyle: |
|
|
||||||
{{- $logoImage := dig "data" "logo" "" $cozystackBranding }}
|
|
||||||
{{- if $logoImage }}
|
|
||||||
.kubeapps-logo {
|
|
||||||
background-image: {{ $logoImage }}
|
|
||||||
}
|
|
||||||
{{- end }}
|
|
||||||
#serviceaccount-selector {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.login-moreinfo {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
a[href="#/docs"] {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.login-group .clr-form-control .clr-control-label {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.appview-separator div.appview-first-row div.center {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.appview-separator div.appview-first-row section[aria-labelledby="app-secrets"] {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.appview-first-row section[aria-labelledby="access-urls-title"] {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
{{- end }}
|
|
||||||
|
|||||||
@@ -7,6 +7,9 @@
|
|||||||
|
|
||||||
{{/* collect dependency namespaces from releases */}}
|
{{/* collect dependency namespaces from releases */}}
|
||||||
{{- range $x := $bundle.releases }}
|
{{- range $x := $bundle.releases }}
|
||||||
|
{{- if or (has $x.name $disabledComponents) (and ($x.optional) (not (has $x.name $enabledComponents))) }}
|
||||||
|
{{- continue }}
|
||||||
|
{{- end }}
|
||||||
{{- $_ := set $dependencyNamespaces $x.name $x.namespace }}
|
{{- $_ := set $dependencyNamespaces $x.name $x.namespace }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
@@ -72,10 +75,21 @@ spec:
|
|||||||
{{- toYaml . | nindent 4}}
|
{{- toYaml . | nindent 4}}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if $x.valuesFrom }}
|
||||||
|
valuesFrom:
|
||||||
|
{{- range $source := $x.valuesFrom }}
|
||||||
|
- kind: {{ $source.kind }}
|
||||||
|
name: {{ $source.name }}
|
||||||
|
{{- if $source.valuesKey }}
|
||||||
|
valuesKey: {{ $source.valuesKey }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
{{- with $x.dependsOn }}
|
{{- with $x.dependsOn }}
|
||||||
dependsOn:
|
dependsOn:
|
||||||
{{- range $dep := . }}
|
{{- range $dep := . }}
|
||||||
{{- if not (has $dep $disabledComponents) }}
|
{{- if hasKey $dependencyNamespaces $dep }}
|
||||||
- name: {{ $dep }}
|
- name: {{ $dep }}
|
||||||
namespace: {{ index $dependencyNamespaces $dep }}
|
namespace: {{ index $dependencyNamespaces $dep }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ image: image-e2e-sandbox
|
|||||||
image-e2e-sandbox:
|
image-e2e-sandbox:
|
||||||
docker buildx build -f images/e2e-sandbox/Dockerfile ../../.. \
|
docker buildx build -f images/e2e-sandbox/Dockerfile ../../.. \
|
||||||
--provenance false \
|
--provenance false \
|
||||||
--builder=$(BUILDER) \
|
|
||||||
--platform=$(PLATFORM) \
|
|
||||||
--tag $(REGISTRY)/e2e-sandbox:$(call settag,$(TAG)) \
|
--tag $(REGISTRY)/e2e-sandbox:$(call settag,$(TAG)) \
|
||||||
--cache-from type=registry,ref=$(REGISTRY)/e2e-sandbox:latest \
|
--cache-from type=registry,ref=$(REGISTRY)/e2e-sandbox:latest \
|
||||||
--cache-to type=inline \
|
--cache-to type=inline \
|
||||||
@@ -30,13 +28,8 @@ image-e2e-sandbox:
|
|||||||
yq -i '.e2e.image = strenv(IMAGE)' values.yaml
|
yq -i '.e2e.image = strenv(IMAGE)' values.yaml
|
||||||
rm -f images/e2e-sandbox.json
|
rm -f images/e2e-sandbox.json
|
||||||
|
|
||||||
test: test-cluster test-apps ## Run the end-to-end tests in existing sandbox
|
test: ## Run the end-to-end tests in existing sandbox.
|
||||||
|
docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && export COZYSTACK_INSTALLER_YAML=$$(helm template -n cozy-system installer ./packages/core/installer) && hack/e2e.sh'
|
||||||
test-cluster: ## Run the end-to-end for creating a cluster
|
|
||||||
docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && export COZYSTACK_INSTALLER_YAML=$$(helm template -n cozy-system installer ./packages/core/installer) && hack/cozytest.sh hack/e2e-cluster.bats'
|
|
||||||
|
|
||||||
test-apps: ## Run the end-to-end tests for apps
|
|
||||||
docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-apps.bats'
|
|
||||||
|
|
||||||
delete: ## Remove sandbox from existing Kubernetes cluster.
|
delete: ## Remove sandbox from existing Kubernetes cluster.
|
||||||
docker rm -f "${SANDBOX_NAME}" || true
|
docker rm -f "${SANDBOX_NAME}" || true
|
||||||
@@ -45,10 +38,5 @@ exec: ## Opens an interactive shell in the sandbox container.
|
|||||||
docker exec -ti "${SANDBOX_NAME}" bash
|
docker exec -ti "${SANDBOX_NAME}" bash
|
||||||
|
|
||||||
apply: delete
|
apply: delete
|
||||||
docker run \
|
docker run -d --rm --name "${SANDBOX_NAME}" --privileged "$$(yq .e2e.image values.yaml)" sleep infinity
|
||||||
-d --rm --name "${SANDBOX_NAME}" --privileged \
|
|
||||||
-e TALOSCONFIG=/workspace/talosconfig \
|
|
||||||
-e KUBECONFIG=/workspace/kubeconfig \
|
|
||||||
"$$(yq .e2e.image values.yaml)" \
|
|
||||||
sleep infinity
|
|
||||||
docker cp "${ROOT_DIR}" "${SANDBOX_NAME}":/workspace
|
docker cp "${ROOT_DIR}" "${SANDBOX_NAME}":/workspace
|
||||||
|
|||||||
@@ -4,16 +4,14 @@ ARG KUBECTL_VERSION=1.32.0
|
|||||||
ARG TALOSCTL_VERSION=1.9.5
|
ARG TALOSCTL_VERSION=1.9.5
|
||||||
ARG HELM_VERSION=3.16.4
|
ARG HELM_VERSION=3.16.4
|
||||||
|
|
||||||
ARG TARGETOS
|
RUN apt-get update
|
||||||
ARG TARGETARCH
|
RUN apt-get -y install genisoimage qemu-kvm qemu-utils iproute2 iptables wget xz-utils netcat curl jq make git
|
||||||
|
RUN curl -LO "https://github.com/siderolabs/talos/releases/download/v${TALOSCTL_VERSION}/talosctl-linux-amd64" \
|
||||||
RUN apt update -q
|
&& chmod +x talosctl-linux-amd64 \
|
||||||
RUN apt install -yq --no-install-recommends genisoimage ca-certificates qemu-kvm qemu-utils iproute2 iptables wget xz-utils netcat curl jq make git
|
&& mv talosctl-linux-amd64 /usr/local/bin/talosctl
|
||||||
RUN curl -sSL "https://github.com/siderolabs/talos/releases/download/v${TALOSCTL_VERSION}/talosctl-${TARGETOS}-${TARGETARCH}" -o /usr/local/bin/talosctl \
|
RUN curl -LO "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
|
||||||
&& chmod +x /usr/local/bin/talosctl
|
&& chmod +x kubectl \
|
||||||
RUN curl -sSL "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl" -o /usr/local/bin/kubectl \
|
&& mv kubectl /usr/local/bin/kubectl
|
||||||
&& chmod +x /usr/local/bin/kubectl
|
RUN curl -sSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash -s - --version "v${HELM_VERSION}"
|
||||||
RUN curl -sSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | bash -s - --version "v${HELM_VERSION}"
|
RUN wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64 -O /usr/local/bin/yq && chmod +x /usr/local/bin/yq
|
||||||
RUN curl -sSL "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_${TARGETOS}_${TARGETARCH}" -o /usr/local/bin/yq \
|
RUN curl -s https://fluxcd.io/install.sh | bash
|
||||||
&& chmod +x /usr/local/bin/yq
|
|
||||||
RUN curl -sSL "https://fluxcd.io/install.sh" | bash
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
e2e:
|
e2e:
|
||||||
image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.31.0-rc.3@sha256:8de0a8900994cb55f74ba25d265eeecac9958b07cdb8f86b9284b9f23668d2bb
|
image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.31.0-rc.1@sha256:a20a6834527ccfc8daf7413a15234f3f7dbbd7774810c8e1966736d487ef7d0c
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
OUT=../_out/repos/extra
|
OUT=../../_out/repos/extra
|
||||||
TMP := $(shell mktemp -d)
|
TMP=../../_out/repos/extra/historical
|
||||||
|
|
||||||
repo:
|
repo:
|
||||||
cd .. && ../hack/package_chart.sh extra $(OUT) $(TMP) library
|
rm -rf "$(OUT)"
|
||||||
|
mkdir -p "$(OUT)"
|
||||||
|
awk '$$3 != "HEAD" {print "mkdir -p $(TMP)/" $$1 "-" $$2}' versions_map | sh -ex
|
||||||
|
awk '$$3 != "HEAD" {print "git archive " $$3 " " $$1 " | tar -xf- --strip-components=1 -C $(TMP)/" $$1 "-" $$2 }' versions_map | sh -ex
|
||||||
|
helm package -d "$(OUT)" $$(find . $(TMP) -mindepth 2 -maxdepth 2 -name Chart.yaml | awk 'sub("/Chart.yaml", "")' | sort -V)
|
||||||
|
cd "$(OUT)" && helm repo index . --url http://cozystack.cozy-system.svc/repos/extra
|
||||||
|
rm -rf "$(TMP)"
|
||||||
|
|
||||||
fix-chartnames:
|
fix-chartnames:
|
||||||
find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done
|
find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
ghcr.io/cozystack/cozystack/matchbox:v0.31.0-rc.3@sha256:8b65a160333830bf4711246ae78f26095e3b33667440bf1bbdd36db60a7f92e2
|
ghcr.io/cozystack/cozystack/matchbox:v0.31.0-rc.1@sha256:de69166fd6efec988cad7ad5be41bbb57c8134508c531d7496fc7f15772e4993
|
||||||
|
|||||||
@@ -3,4 +3,4 @@ name: ingress
|
|||||||
description: NGINX Ingress Controller
|
description: NGINX Ingress Controller
|
||||||
icon: /logos/ingress-nginx.svg
|
icon: /logos/ingress-nginx.svg
|
||||||
type: application
|
type: application
|
||||||
version: 1.6.0
|
version: 1.5.1
|
||||||
|
|||||||
@@ -4,10 +4,13 @@
|
|||||||
|
|
||||||
### Common parameters
|
### Common parameters
|
||||||
|
|
||||||
| Name | Description | Value |
|
| Name | Description | Value |
|
||||||
| ---------------- | ----------------------------------------------------------------- | ------- |
|
| ----------------- | ----------------------------------------------------------------- | ------- |
|
||||||
| `replicas` | Number of ingress-nginx replicas | `2` |
|
| `replicas` | Number of ingress-nginx replicas | `2` |
|
||||||
| `externalIPs` | List of externalIPs for service. | `[]` |
|
| `externalIPs` | List of externalIPs for service. | `[]` |
|
||||||
| `whitelist` | List of client networks | `[]` |
|
| `whitelist` | List of client networks | `[]` |
|
||||||
| `clouflareProxy` | Restoring original visitor IPs when Cloudflare proxied is enabled | `false` |
|
| `clouflareProxy` | Restoring original visitor IPs when Cloudflare proxied is enabled | `false` |
|
||||||
|
| `dashboard` | Should ingress serve Cozystack service dashboard | `false` |
|
||||||
|
| `cdiUploadProxy` | Should ingress serve CDI upload proxy | `false` |
|
||||||
|
| `virtExportProxy` | Should ingress serve KubeVirt export proxy | `false` |
|
||||||
|
|
||||||
|
|||||||
37
packages/extra/ingress/templates/cdi-uploadproxy.yaml
Normal file
37
packages/extra/ingress/templates/cdi-uploadproxy.yaml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
|
||||||
|
{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }}
|
||||||
|
|
||||||
|
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
|
||||||
|
{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
|
||||||
|
|
||||||
|
{{- if .Values.cdiUploadProxy }}
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
|
||||||
|
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||||
|
{{- if eq $issuerType "cloudflare" }}
|
||||||
|
{{- else }}
|
||||||
|
acme.cert-manager.io/http01-ingress-class: {{ .Release.Namespace }}
|
||||||
|
{{- end }}
|
||||||
|
name: cdi-uploadproxy-{{ .Release.Namespace }}
|
||||||
|
namespace: cozy-kubevirt-cdi
|
||||||
|
spec:
|
||||||
|
ingressClassName: {{ .Release.Namespace }}
|
||||||
|
rules:
|
||||||
|
- host: cdi-uploadproxy.{{ $host }}
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- backend:
|
||||||
|
service:
|
||||||
|
name: cdi-uploadproxy
|
||||||
|
port:
|
||||||
|
number: 443
|
||||||
|
path: /
|
||||||
|
pathType: Prefix
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- cdi-uploadproxy.{{ $host }}
|
||||||
|
secretName: cdi-uploadproxy-{{ .Release.Namespace }}-tls
|
||||||
|
{{- end }}
|
||||||
@@ -1,10 +1,19 @@
|
|||||||
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
|
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
|
||||||
{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }}
|
{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }}
|
||||||
{{- $host := index $cozyConfig.data "root-host" }}
|
|
||||||
{{- $exposeServices := splitList "," ((index $cozyConfig.data "expose-services") | default "") }}
|
|
||||||
{{- $exposeIngress := index $cozyConfig.data "expose-ingress" | default "tenant-root" }}
|
|
||||||
|
|
||||||
{{- if and (has "dashboard" $exposeServices) }}
|
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
|
||||||
|
{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
|
||||||
|
|
||||||
|
{{- $tenantRoot := dict }}
|
||||||
|
{{- if .Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2" }}
|
||||||
|
{{- $tenantRoot = lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" "tenant-root" "tenant-root" }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if and $tenantRoot $tenantRoot.spec $tenantRoot.spec.values $tenantRoot.spec.values.host }}
|
||||||
|
{{- $host = $tenantRoot.spec.values.host }}
|
||||||
|
{{- else }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- if .Values.dashboard }}
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
@@ -12,16 +21,16 @@ metadata:
|
|||||||
cert-manager.io/cluster-issuer: letsencrypt-prod
|
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||||
{{- if eq $issuerType "cloudflare" }}
|
{{- if eq $issuerType "cloudflare" }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
acme.cert-manager.io/http01-ingress-class: {{ $exposeIngress }}
|
acme.cert-manager.io/http01-ingress-class: {{ .Release.Namespace }}
|
||||||
{{- end }}
|
|
||||||
nginx.ingress.kubernetes.io/proxy-body-size: 100m
|
nginx.ingress.kubernetes.io/proxy-body-size: 100m
|
||||||
nginx.ingress.kubernetes.io/proxy-buffer-size: 100m
|
nginx.ingress.kubernetes.io/proxy-buffer-size: 100m
|
||||||
nginx.ingress.kubernetes.io/proxy-buffers-number: "4"
|
nginx.ingress.kubernetes.io/proxy-buffers-number: "4"
|
||||||
nginx.ingress.kubernetes.io/client-max-body-size: 100m
|
nginx.ingress.kubernetes.io/client-max-body-size: 100m
|
||||||
name: dashboard
|
{{- end }}
|
||||||
|
name: dashboard-{{ .Release.Namespace }}
|
||||||
namespace: cozy-dashboard
|
namespace: cozy-dashboard
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: {{ $exposeIngress }}
|
ingressClassName: {{ .Release.Namespace }}
|
||||||
rules:
|
rules:
|
||||||
- host: dashboard.{{ $host }}
|
- host: dashboard.{{ $host }}
|
||||||
http:
|
http:
|
||||||
@@ -36,5 +45,5 @@ spec:
|
|||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
- dashboard.{{ $host }}
|
- dashboard.{{ $host }}
|
||||||
secretName: dashboard-tls
|
secretName: dashboard-{{ .Release.Namespace }}-tls
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -1,6 +1,3 @@
|
|||||||
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
|
|
||||||
{{- $exposeIngress := index $cozyConfig.data "expose-ingress" | default "tenant-root" }}
|
|
||||||
{{- $exposeExternalIPs := (index $cozyConfig.data "expose-external-ips") | default "" }}
|
|
||||||
apiVersion: helm.toolkit.fluxcd.io/v2
|
apiVersion: helm.toolkit.fluxcd.io/v2
|
||||||
kind: HelmRelease
|
kind: HelmRelease
|
||||||
metadata:
|
metadata:
|
||||||
@@ -34,9 +31,9 @@ spec:
|
|||||||
enabled: false
|
enabled: false
|
||||||
{{- end }}
|
{{- end }}
|
||||||
service:
|
service:
|
||||||
{{- if and (eq $exposeIngress .Release.Namespace) $exposeExternalIPs }}
|
{{- if .Values.externalIPs }}
|
||||||
externalIPs:
|
externalIPs:
|
||||||
{{- toYaml (splitList "," $exposeExternalIPs) | nindent 12 }}
|
{{- toYaml .Values.externalIPs | nindent 12 }}
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
externalTrafficPolicy: Cluster
|
externalTrafficPolicy: Cluster
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
|||||||
@@ -25,6 +25,21 @@
|
|||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Restoring original visitor IPs when Cloudflare proxied is enabled",
|
"description": "Restoring original visitor IPs when Cloudflare proxied is enabled",
|
||||||
"default": false
|
"default": false
|
||||||
|
},
|
||||||
|
"dashboard": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "Should ingress serve Cozystack service dashboard",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
|
"cdiUploadProxy": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "Should ingress serve CDI upload proxy",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
|
"virtExportProxy": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "Should ingress serve KubeVirt export proxy",
|
||||||
|
"default": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user