Merge branch 'main' into cdi-upload

.github/workflows/pre-commit.yml

@@ -0,0 +1,35 @@
+name: Pre-Commit Checks
+
+on: [push, pull_request]
+
+jobs:
+ pre-commit:
+ runs-on: ubuntu-22.04
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+
+ - name: Set up Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: '3.11'
+
+ - name: Install pre-commit
+ run: pip install pre-commit
+
+ - name: Run pre-commit hooks
+ run: |
+ git fetch origin main || git fetch origin master
+ base_commit=$(git rev-parse --verify origin/main || git rev-parse --verify origin/master || echo "")
+
+ if [ -z "$base_commit" ]; then
+ files=$(git ls-files '*.yaml' '*.md')
+ else
+ files=$(git diff --name-only "$base_commit" -- '*.yaml' '*.md')
+ fi
+
+ if [ -n "$files" ]; then
+ echo "$files" | xargs pre-commit run --files
+ else
+ echo "No YAML or Markdown files to lint"
+ fi

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.5.0
+ hooks:
+ - id: end-of-file-fixer
+ - id: trailing-whitespace
+ - id: mixed-line-ending
+ args: [--fix=lf]
+ - id: check-yaml
+ exclude: packages/apps/postgres/templates/init-script.yaml
+ args: [--unsafe]
+- repo: https://github.com/igorshubovych/markdownlint-cli
+ rev: v0.41.0
+ hooks:
+ - id: markdownlint
+ args: [--fix, --disable, MD013, MD041, --]

hack/pre-checks.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+YQ_VERSION="v4.35.1"
+RED='\033[31m'
+RESET='\033[0m'
+
+check-yq-version() {
+ current_version=$(yq -V | grep -oP 'v[0-9]+\.[0-9]+\.[0-9]+')
+ if [ -z "$current_version" ]; then
+ echo "yq is not installed or version cannot be determined."
+ exit 1
+ fi
+ echo "Current yq version: $current_version"
+
+ if [ "$(printf '%s\n' "$YQ_VERSION" "$current_version" | sort -V | head -n1)" = "$YQ_VERSION" ]; then
+ echo "Greater than or equal to $YQ_VERSION"
+ else
+ echo -e "${RED}ERROR: yq version less than $YQ_VERSION${RESET}"
+ exit 1
+ fi
+}
+
+check-yq-version

manifests/cozystack-installer.yaml

@@ -68,7 +68,7 @@ spec:
  serviceAccountName: cozystack
  containers:
  - name: cozystack
- image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.4"
+ image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.5"
  env:
  - name: KUBERNETES_SERVICE_HOST
  value: localhost
@@ -87,7 +87,7 @@ spec:
  fieldRef:
  fieldPath: metadata.name
  - name: darkhttpd
- image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.4"
+ image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.5"
  command:
  - /usr/bin/darkhttpd
  - /cozystack/assets

packages/apps/README.md

@@ -0,0 +1,9 @@
+### How to test packages local
+
+```bash
+cd packages/core/installer
+make image-cozystack REGISTRY=YOUR_CUSTOM_REGISTRY
+make apply
+kubectl delete pod dashboard-redis-master-0 -n cozy-dashboard
+kubectl delete po -l app=source-controller -n cozy-fluxcd
+```

packages/apps/kubernetes/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.0
+version: 0.13.0
 
 # 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

packages/apps/kubernetes/README.md

@@ -27,26 +27,181 @@ How to access to deployed cluster:
 kubectl get secret -n <namespace> kubernetes-<clusterName>-admin-kubeconfig -o go-template='{{ printf "%s\n" (index .data "super-admin.conf" | base64decode) }}' > test
 ```
 
-## Parameters
+# Series
 
-### Common parameters
+<!-- source: https://github.com/kubevirt/common-instancetypes/blob/main/README.md -->
 
-| Name | Description | Value |
-| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ------------ |
-| `host` | The hostname used to access the Kubernetes cluster externally (defaults to using the cluster name as a subdomain for the tenant host). | `""` |
-| `controlPlane.replicas` | Number of replicas for Kubernetes contorl-plane components | `2` |
-| `storageClass` | StorageClass used to store user data | `replicated` |
-| `nodeGroups` | nodeGroups configuration | `{}` |
+. | U | O | CX | M | RT
+----------------------------|-----|-----|------|-----|------
+*Has GPUs* | | | | |
+*Hugepages* | | | ✓ | ✓ | ✓
+*Overcommitted Memory* | | ✓ | | |
+*Dedicated CPU* | | | ✓ | | ✓
+*Burstable CPU performance* | ✓ | ✓ | | ✓ |
+*Isolated emulator threads* | | | ✓ | | ✓
+*vNUMA* | | | ✓ | | ✓
+*vCPU-To-Memory Ratio* | 1:4 | 1:4 | 1:2 | 1:8 | 1:4
 
-### Cluster Addons
 
-| Name | Description | Value |
-| ------------------------------------ | ---------------------------------------------------------------------------------- | ------- |
-| `addons.certManager.enabled` | Enables the cert-manager | `false` |
-| `addons.certManager.valuesOverride` | Custom values to override | `{}` |
-| `addons.ingressNginx.enabled` | Enable Ingress-NGINX controller (expect nodes with 'ingress-nginx' role) | `false` |
-| `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.fluxcd.enabled` | Enables Flux CD | `false` |
-| `addons.fluxcd.valuesOverride` | Custom values to override | `{}` |
+## U Series
 
+The U Series is quite neutral and provides resources for
+general purpose applications.
+
+*U* is the abbreviation for "Universal", hinting at the universal
+attitude towards workloads.
+
+VMs of instance types will share physical CPU cores on a
+time-slice basis with other VMs.
+
+### U Series Characteristics
+
+Specific characteristics of this series are:
+- *Burstable CPU performance* - The workload has a baseline compute
+ performance but is permitted to burst beyond this baseline, if
+ excess compute resources are available.
+- *vCPU-To-Memory Ratio (1:4)* - A vCPU-to-Memory ratio of 1:4, for less
+ noise per node.
+
+## O Series
+
+The O Series is based on the U Series, with the only difference
+being that memory is overcommitted.
+
+*O* is the abbreviation for "Overcommitted".
+
+### UO Series Characteristics
+
+Specific characteristics of this series are:
+- *Burstable CPU performance* - The workload has a baseline compute
+ performance but is permitted to burst beyond this baseline, if
+ excess compute resources are available.
+- *Overcommitted Memory* - Memory is over-committed in order to achieve
+ a higher workload density.
+- *vCPU-To-Memory Ratio (1:4)* - A vCPU-to-Memory ratio of 1:4, for less
+ noise per node.
+
+## CX Series
+
+The CX Series provides exclusive compute resources for compute
+intensive applications.
+
+*CX* is the abbreviation of "Compute Exclusive".
+
+The exclusive resources are given to the compute threads of the
+VM. In order to ensure this, some additional cores (depending
+on the number of disks and NICs) will be requested to offload
+the IO threading from cores dedicated to the workload.
+In addition, in this series, the NUMA topology of the used
+cores is provided to the VM.
+
+### CX Series Characteristics
+
+Specific characteristics of this series are:
+- *Hugepages* - Hugepages are used in order to improve memory
+ performance.
+- *Dedicated CPU* - Physical cores are exclusively assigned to every
+ vCPU in order to provide fixed and high compute guarantees to the
+ workload.
+- *Isolated emulator threads* - Hypervisor emulator threads are isolated
+ from the vCPUs in order to reduce emaulation related impact on the
+ workload.
+- *vNUMA* - Physical NUMA topology is reflected in the guest in order to
+ optimize guest sided cache utilization.
+- *vCPU-To-Memory Ratio (1:2)* - A vCPU-to-Memory ratio of 1:2.
+
+## M Series
+
+The M Series provides resources for memory intensive
+applications.
+
+*M* is the abbreviation of "Memory".
+
+### M Series Characteristics
+
+Specific characteristics of this series are:
+- *Hugepages* - Hugepages are used in order to improve memory
+ performance.
+- *Burstable CPU performance* - The workload has a baseline compute
+ performance but is permitted to burst beyond this baseline, if
+ excess compute resources are available.
+- *vCPU-To-Memory Ratio (1:8)* - A vCPU-to-Memory ratio of 1:8, for much
+ less noise per node.
+
+## RT Series
+
+The RT Series provides resources for realtime applications, like Oslat.
+
+*RT* is the abbreviation for "realtime".
+
+This series of instance types requires nodes capable of running
+realtime applications.
+
+### RT Series Characteristics
+
+Specific characteristics of this series are:
+- *Hugepages* - Hugepages are used in order to improve memory
+ performance.
+- *Dedicated CPU* - Physical cores are exclusively assigned to every
+ vCPU in order to provide fixed and high compute guarantees to the
+ workload.
+- *Isolated emulator threads* - Hypervisor emulator threads are isolated
+ from the vCPUs in order to reduce emaulation related impact on the
+ workload.
+- *vCPU-To-Memory Ratio (1:4)* - A vCPU-to-Memory ratio of 1:4 starting from
+ the medium size.
+
+## Resources
+
+The following instancetype resources are provided by Cozystack:
+
+Name | vCPUs | Memory
+-----|-------|-------
+cx1.2xlarge | 8 | 16Gi
+cx1.4xlarge | 16 | 32Gi
+cx1.8xlarge | 32 | 64Gi
+cx1.large | 2 | 4Gi
+cx1.medium | 1 | 2Gi
+cx1.xlarge | 4 | 8Gi
+gn1.2xlarge | 8 | 32Gi
+gn1.4xlarge | 16 | 64Gi
+gn1.8xlarge | 32 | 128Gi
+gn1.xlarge | 4 | 16Gi
+m1.2xlarge | 8 | 64Gi
+m1.4xlarge | 16 | 128Gi
+m1.8xlarge | 32 | 256Gi
+m1.large | 2 | 16Gi
+m1.xlarge | 4 | 32Gi
+n1.2xlarge | 16 | 32Gi
+n1.4xlarge | 32 | 64Gi
+n1.8xlarge | 64 | 128Gi
+n1.large | 4 | 8Gi
+n1.medium | 4 | 4Gi
+n1.xlarge | 8 | 16Gi
+o1.2xlarge | 8 | 32Gi
+o1.4xlarge | 16 | 64Gi
+o1.8xlarge | 32 | 128Gi
+o1.large | 2 | 8Gi
+o1.medium | 1 | 4Gi
+o1.micro | 1 | 1Gi
+o1.nano | 1 | 512Mi
+o1.small | 1 | 2Gi
+o1.xlarge | 4 | 16Gi
+rt1.2xlarge | 8 | 32Gi
+rt1.4xlarge | 16 | 64Gi
+rt1.8xlarge | 32 | 128Gi
+rt1.large | 2 | 8Gi
+rt1.medium | 1 | 4Gi
+rt1.micro | 1 | 1Gi
+rt1.small | 1 | 2Gi
+rt1.xlarge | 4 | 16Gi
+u1.2xlarge | 8 | 32Gi
+u1.2xmedium | 2 | 4Gi
+u1.4xlarge | 16 | 64Gi
+u1.8xlarge | 32 | 128Gi
+u1.large | 2 | 8Gi
+u1.medium | 1 | 4Gi
+u1.micro | 1 | 1Gi
+u1.nano | 1 | 512Mi
+u1.small | 1 | 2Gi
+u1.xlarge | 4 | 16Gi

packages/apps/kubernetes/images/cluster-autoscaler.tag

@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/cluster-autoscaler:0.12.0@sha256:7f617de5a24de790a15d9e97c6287ff2b390922e6e74c7a665cbf498f634514d
+ghcr.io/aenix-io/cozystack/cluster-autoscaler:0.12.1@sha256:7f617de5a24de790a15d9e97c6287ff2b390922e6e74c7a665cbf498f634514d

packages/apps/kubernetes/images/kubevirt-cloud-provider.tag

@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/kubevirt-cloud-provider:0.12.0@sha256:df4a937b6fb2b345110174227170691d48189ffe1900c3f848cd5085990a58df
+ghcr.io/aenix-io/cozystack/kubevirt-cloud-provider:0.12.1@sha256:ca606d6039ed43a48d4dfd98a91fd3cec120f08c1e221cd4e99ea94239389742

packages/apps/kubernetes/images/kubevirt-csi-driver.tag

@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/kubevirt-csi-driver:0.12.0@sha256:86029548078960feecca116087b2135230d676b83c503f292eb50e1199be2790
+ghcr.io/aenix-io/cozystack/kubevirt-csi-driver:0.12.1@sha256:86029548078960feecca116087b2135230d676b83c503f292eb50e1199be2790