diff --git a/api/apps/v1alpha1/foundationdb/types.go b/api/apps/v1alpha1/foundationdb/types.go index 0856d4c8b..fa801afbf 100644 --- a/api/apps/v1alpha1/foundationdb/types.go +++ b/api/apps/v1alpha1/foundationdb/types.go @@ -39,7 +39,7 @@ type ConfigSpec struct { // +kubebuilder:default:={} CustomParameters []string `json:"customParameters,omitempty"` // Container image deployment type. - // +kubebuilder:default:="unified" + // +kubebuilder:default:="split" ImageType ImageType `json:"imageType"` // Security context for containers. // +kubebuilder:default:={} diff --git a/hack/e2e-apps/bucket.bats b/hack/e2e-apps/bucket.bats index a4a349d71..9fd127ee9 100644 --- a/hack/e2e-apps/bucket.bats +++ b/hack/e2e-apps/bucket.bats @@ -19,7 +19,7 @@ spec: EOF # Wait for the bucket to be ready - kubectl -n tenant-test wait hr bucket-${name} --timeout=100s --for=condition=ready + kubectl -n tenant-test wait hr bucket-${name} --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io bucket-${name} >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait bucketclaims.objectstorage.k8s.io bucket-${name} --timeout=300s --for=jsonpath='{.status.bucketReady}' timeout 60 sh -ec "until kubectl -n tenant-test get bucketaccesses.objectstorage.k8s.io bucket-${name}-admin >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/clickhouse.bats b/hack/e2e-apps/clickhouse.bats index 733da0fff..72400867a 100644 --- a/hack/e2e-apps/clickhouse.bats +++ b/hack/e2e-apps/clickhouse.bats @@ -38,7 +38,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr clickhouse-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr clickhouse-$name --timeout=20s --for=condition=ready + kubectl -n tenant-test wait hr clickhouse-$name --timeout=5m --for=condition=ready timeout 180 sh -ec "until kubectl -n tenant-test get svc chendpoint-clickhouse-$name -o jsonpath='{.spec.ports[*].port}' | grep -q '8123 9000'; do sleep 10; done" timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 --timeout=120s --for=jsonpath='{.status.replicas}'=1 diff --git a/hack/e2e-apps/etcd.bats b/hack/e2e-apps/etcd.bats index abc290dbb..7dcfd73fa 100644 --- a/hack/e2e-apps/etcd.bats +++ b/hack/e2e-apps/etcd.bats @@ -26,7 +26,7 @@ dump_diagnostics() { # resource, so poll for existence first. wait_etcd_hr_ready() { timeout 60 sh -ec 'until kubectl -n tenant-test get hr/etcd >/dev/null 2>&1; do sleep 2; done' - kubectl -n tenant-test wait hr/etcd --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr/etcd --timeout=5m --for=condition=ready } @test "Create Etcd" { diff --git a/hack/e2e-apps/external-dns.bats b/hack/e2e-apps/external-dns.bats index 5775927f3..23b3e8cf6 100644 --- a/hack/e2e-apps/external-dns.bats +++ b/hack/e2e-apps/external-dns.bats @@ -21,8 +21,9 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name} >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr ${name} --timeout=120s --for=condition=ready - kubectl -n tenant-test wait hr ${name}-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr ${name} --timeout=5m --for=condition=ready + timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name}-system >/dev/null 2>&1; do sleep 2; done" + kubectl -n tenant-test wait hr ${name}-system --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get deploy -l app.kubernetes.io/instance=${name}-system -o jsonpath='{.items[0].status.readyReplicas}' | grep -q '1'; do sleep 5; done" kubectl -n tenant-test delete externaldns.apps.cozystack.io ${name} @@ -46,8 +47,9 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name} >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr ${name} --timeout=120s --for=condition=ready - kubectl -n tenant-test wait hr ${name}-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr ${name} --timeout=5m --for=condition=ready + timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name}-system >/dev/null 2>&1; do sleep 2; done" + kubectl -n tenant-test wait hr ${name}-system --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get deploy -l app.kubernetes.io/instance=${name}-system -o jsonpath='{.items[0].status.readyReplicas}' | grep -q '1'; do sleep 5; done" kubectl -n tenant-test delete externaldns.apps.cozystack.io ${name} diff --git a/hack/e2e-apps/harbor.bats b/hack/e2e-apps/harbor.bats index 290fef425..10ad3c95c 100644 --- a/hack/e2e-apps/harbor.bats +++ b/hack/e2e-apps/harbor.bats @@ -41,7 +41,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr $release >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr $release --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr $release --timeout=5m --for=condition=ready # Wait for COSI to provision bucket timeout 60 sh -ec "until kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io $release-registry >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/kafka.bats b/hack/e2e-apps/kafka.bats index ef4d9187c..d0a8266b9 100644 --- a/hack/e2e-apps/kafka.bats +++ b/hack/e2e-apps/kafka.bats @@ -42,7 +42,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr kafka-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr kafka-$name --timeout=30s --for=condition=ready + kubectl -n tenant-test wait hr kafka-$name --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get kafkas $name >/dev/null 2>&1; do sleep 2; done" kubectl wait kafkas -n tenant-test $name --timeout=300s --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0; do sleep 10; done" diff --git a/hack/e2e-apps/mariadb.bats b/hack/e2e-apps/mariadb.bats index 35559216e..0c1e3a5e8 100644 --- a/hack/e2e-apps/mariadb.bats +++ b/hack/e2e-apps/mariadb.bats @@ -38,7 +38,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr mariadb-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr mariadb-$name --timeout=30s --for=condition=ready + kubectl -n tenant-test wait hr mariadb-$name --timeout=5m --for=condition=ready timeout 80 sh -ec "until kubectl -n tenant-test get svc mariadb-$name -o jsonpath='{.spec.ports[0].port}' | grep -q '3306'; do sleep 10; done" timeout 80 sh -ec "until kubectl -n tenant-test get endpoints mariadb-$name -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done" timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/mariadb-$name >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/mongodb.bats b/hack/e2e-apps/mongodb.bats index bc83f7ab7..0750e4317 100644 --- a/hack/e2e-apps/mongodb.bats +++ b/hack/e2e-apps/mongodb.bats @@ -30,7 +30,7 @@ EOF # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr mongodb-$name >/dev/null 2>&1; do sleep 2; done" # Wait for HelmRelease - kubectl -n tenant-test wait hr mongodb-$name --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr mongodb-$name --timeout=5m --for=condition=ready # Wait for MongoDB service (port 27017) timeout 120 sh -ec "until kubectl -n tenant-test get svc mongodb-$name-rs0 -o jsonpath='{.spec.ports[0].port}' | grep -q '27017'; do sleep 10; done" # Wait for endpoints diff --git a/hack/e2e-apps/openbao.bats b/hack/e2e-apps/openbao.bats index 168440ade..81ca42b3e 100644 --- a/hack/e2e-apps/openbao.bats +++ b/hack/e2e-apps/openbao.bats @@ -21,8 +21,8 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr openbao-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr openbao-$name --timeout=60s --for=condition=ready - kubectl -n tenant-test wait hr openbao-$name-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr openbao-$name --timeout=5m --for=condition=ready + kubectl -n tenant-test wait hr openbao-$name-system --timeout=5m --for=condition=ready # Wait for container to be started (pod Running does not guarantee container is ready for exec on slow CI) if ! timeout 120 sh -ec "until kubectl -n tenant-test get pod openbao-$name-0 --output jsonpath='{.status.containerStatuses[0].started}' 2>/dev/null | grep -q true; do sleep 5; done"; then diff --git a/hack/e2e-apps/postgres.bats b/hack/e2e-apps/postgres.bats index bdd63c900..44c0c5bd7 100644 --- a/hack/e2e-apps/postgres.bats +++ b/hack/e2e-apps/postgres.bats @@ -43,7 +43,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr postgres-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr postgres-$name --timeout=100s --for=condition=ready + kubectl -n tenant-test wait hr postgres-$name --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get job.batch postgres-$name-init-job >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait job.batch postgres-$name-init-job --timeout=50s --for=condition=Complete timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-r -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done" diff --git a/hack/e2e-apps/qdrant.bats b/hack/e2e-apps/qdrant.bats index 8a889e439..7d031a1d7 100755 --- a/hack/e2e-apps/qdrant.bats +++ b/hack/e2e-apps/qdrant.bats @@ -20,8 +20,8 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr qdrant-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr qdrant-$name --timeout=60s --for=condition=ready - kubectl -n tenant-test wait hr qdrant-$name-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr qdrant-$name --timeout=5m --for=condition=ready + kubectl -n tenant-test wait hr qdrant-$name-system --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get sts qdrant-$name >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait sts qdrant-$name --timeout=90s --for=jsonpath='{.status.readyReplicas}'=1 timeout 60 sh -ec "until kubectl -n tenant-test get pvc qdrant-storage-qdrant-$name-0 >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/redis.bats b/hack/e2e-apps/redis.bats index eb148701f..98eb4595e 100644 --- a/hack/e2e-apps/redis.bats +++ b/hack/e2e-apps/redis.bats @@ -21,7 +21,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr redis-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr redis-$name --timeout=20s --for=condition=ready + kubectl -n tenant-test wait hr redis-$name --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get pvc redisfailover-persistent-data-rfr-redis-$name-0 >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait pvc redisfailover-persistent-data-rfr-redis-$name-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound timeout 60 sh -ec "until kubectl -n tenant-test get deploy rfs-redis-$name >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/run-kubernetes.sh b/hack/e2e-apps/run-kubernetes.sh index 39a7f59e0..10a959ac6 100644 --- a/hack/e2e-apps/run-kubernetes.sh +++ b/hack/e2e-apps/run-kubernetes.sh @@ -477,6 +477,15 @@ EOF delete ingress hairpin-probe --ignore-not-found 2>/dev/null || true fi + # Wait for the parent kubernetes-${test_name} HR to be Ready before the + # remediation guard runs. The guard reads `.status.history`, which is empty + # until the helm install action completes — under Flux v2.8 kstatus the + # parent's helm install can still be "Running 'install'" after every child + # HR (cilium, coredns, csi, vsnap-crd, ingress-nginx) is already Ready, + # because kstatus walks all applied resources before flipping the parent + # Ready. + kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready + # Guard: parent HelmRelease must not have entered an install/upgrade remediation cycle. # A non-zero installFailures/upgradeFailures indicates the helm-wait budget expired while # admin-kubeconfig was still being provisioned, which would trigger uninstall remediation diff --git a/hack/e2e-apps/vminstance.bats b/hack/e2e-apps/vminstance.bats index 15148c473..79b0ef6b9 100644 --- a/hack/e2e-apps/vminstance.bats +++ b/hack/e2e-apps/vminstance.bats @@ -28,7 +28,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-disk-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr vm-disk-$name --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr vm-disk-$name --timeout=5m --for=condition=ready kubectl -n tenant-test wait dv vm-disk-$name --timeout=250s --for=condition=ready kubectl -n tenant-test wait pvc vm-disk-$name --timeout=200s --for=jsonpath='{.status.phase}'=Bound # Drop the VMDisk so the next test starts from a clean slate. Each test @@ -63,7 +63,7 @@ spec: storageClass: replicated EOF timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-disk-$diskName >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr vm-disk-$diskName --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr vm-disk-$diskName --timeout=5m --for=condition=ready kubectl -n tenant-test wait dv vm-disk-$diskName --timeout=250s --for=condition=ready kubectl -n tenant-test wait pvc vm-disk-$diskName --timeout=200s --for=jsonpath='{.status.phase}'=Bound kubectl apply -f - </dev/null 2>&1; do sleep 2; done" + # Wait for the parent HR Ready before polling for the VMI. Under Flux v2.8 + # kstatus the helm install can be still dispatching when the previous + # ordering assumed it had already applied the VirtualMachine CR — without + # this the next poll for `vmi vm-instance-$name` returned NotFound for + # its entire 120s budget because kubevirt hadn't seen the VM yet. + kubectl -n tenant-test wait hr vm-instance-$name --timeout=5m --for=condition=ready # Nested KubeVirt VM startup (virt-launcher + libvirt + cloud-init DHCP) - # routinely takes 30-60s under runner load; the previous 20s was unrealistic - # and produced flakes. 120s is a comfortable upper bound for nested virt. - timeout 120 sh -ec "until kubectl -n tenant-test get vmi vm-instance-$name -o jsonpath='{.status.interfaces[0].ipAddress}' | grep -q '[0-9]'; do sleep 2; done" - kubectl -n tenant-test wait hr vm-instance-$name --timeout=60s --for=condition=ready + # routinely takes 30-60s under runner load. 5m is a comfortable upper + # bound for nested virt + slow runner I/O after the HR-Ready gate. + timeout 5m sh -ec "until kubectl -n tenant-test get vmi vm-instance-$name -o jsonpath='{.status.interfaces[0].ipAddress}' | grep -q '[0-9]'; do sleep 2; done" # VM ready follows IP assignment closely; 60s gives buffer for the qemu-guest-agent. - kubectl -n tenant-test wait vm vm-instance-$name --timeout=60s --for=condition=ready + kubectl -n tenant-test wait vm vm-instance-$name --timeout=5m --for=condition=ready kubectl -n tenant-test delete vminstances.apps.cozystack.io $name --ignore-not-found --timeout=3m kubectl -n tenant-test delete vmdisks.apps.cozystack.io $diskName --ignore-not-found --timeout=3m } diff --git a/internal/fluxinstall/manifests/fluxcd-tenants.yaml b/internal/fluxinstall/manifests/fluxcd-tenants.yaml index 077cf34c3..744fb78eb 100644 --- a/internal/fluxinstall/manifests/fluxcd-tenants.yaml +++ b/internal/fluxinstall/manifests/fluxcd-tenants.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/name: flux-tenants app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 sharding.fluxcd.io/role: shard name: flux-tenants namespace: cozy-fluxcd @@ -56,7 +56,7 @@ spec: resource: limits.memory - name: TUF_ROOT value: /tmp/.sigstore - image: "ghcr.io/fluxcd/helm-controller:v1.4.3" + image: "ghcr.io/fluxcd/helm-controller:v1.5.0" imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/internal/fluxinstall/manifests/fluxcd.yaml b/internal/fluxinstall/manifests/fluxcd.yaml index 803f52bbf..401614644 100644 --- a/internal/fluxinstall/manifests/fluxcd.yaml +++ b/internal/fluxinstall/manifests/fluxcd.yaml @@ -10,7 +10,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: alerts.notification.toolkit.fluxcd.io spec: group: notification.toolkit.fluxcd.io @@ -102,6 +102,8 @@ spec: - ImagePolicy - ImageUpdateAutomation - OCIRepository + - ArtifactGenerator + - ExternalArtifact type: string matchLabels: additionalProperties: @@ -315,6 +317,8 @@ spec: - ImagePolicy - ImageUpdateAutomation - OCIRepository + - ArtifactGenerator + - ExternalArtifact type: string matchLabels: additionalProperties: @@ -394,7 +398,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: artifactgenerators.source.extensions.fluxcd.io spec: group: source.extensions.fluxcd.io @@ -476,10 +480,14 @@ spec: Strategy specifies the copy strategy to use. 'Overwrite' will overwrite existing files in the destination. 'Merge' is for merging YAML files using Helm values merge strategy. + 'Extract' is for extracting the contents of tarball archives (.tar.gz, .tgz) + When using glob patterns, non-tarball files are silently skipped. For single file sources, + the file must be a tarball or an error is returned. Directories are not supported. If not specified, defaults to 'Overwrite'. enum: - Overwrite - Merge + - Extract type: string to: description: |- @@ -548,6 +556,8 @@ spec: - Bucket - GitRepository - OCIRepository + - HelmChart + - ExternalArtifact type: string name: description: Name of the source. @@ -686,7 +696,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: buckets.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -1052,380 +1062,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .spec.endpoint - name: Endpoint - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - deprecated: true - deprecationWarning: v1beta2 Bucket is deprecated, upgrade to v1 - name: v1beta2 - schema: - openAPIV3Schema: - description: Bucket is the Schema for the buckets API. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: |- - BucketSpec specifies the required configuration to produce an Artifact for - an object storage bucket. - properties: - accessFrom: - description: |- - AccessFrom specifies an Access Control List for allowing cross-namespace - references to this object. - NOTE: Not implemented, provisional as of https://github.com/fluxcd/flux2/pull/2092 - properties: - namespaceSelectors: - description: |- - NamespaceSelectors is the list of namespace selectors to which this ACL applies. - Items in this list are evaluated using a logical OR operation. - items: - description: |- - NamespaceSelector selects the namespaces to which this ACL applies. - An empty map of MatchLabels matches all namespaces in a cluster. - properties: - matchLabels: - additionalProperties: - type: string - description: |- - MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, whose key field is "key", the - operator is "In", and the values array contains only "value". The requirements are ANDed. - type: object - type: object - type: array - required: - - namespaceSelectors - type: object - bucketName: - description: BucketName is the name of the object storage bucket. - type: string - certSecretRef: - description: |- - CertSecretRef can be given the name of a Secret containing - either or both of - - - a PEM-encoded client certificate (`tls.crt`) and private - key (`tls.key`); - - a PEM-encoded CA certificate (`ca.crt`) - - and whichever are supplied, will be used for connecting to the - bucket. The client cert and key are useful if you are - authenticating with a certificate; the CA cert is useful if - you are using a self-signed server certificate. The Secret must - be of type `Opaque` or `kubernetes.io/tls`. - - This field is only supported for the `generic` provider. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - endpoint: - description: Endpoint is the object storage address the BucketName is located at. - type: string - ignore: - description: |- - Ignore overrides the set of excluded patterns in the .sourceignore format - (which is the same as .gitignore). If not provided, a default will be used, - consult the documentation for your version to find out what those are. - type: string - insecure: - description: Insecure allows connecting to a non-TLS HTTP Endpoint. - type: boolean - interval: - description: |- - Interval at which the Bucket Endpoint is checked for updates. - This interval is approximate and may be subject to jitter to ensure - efficient use of resources. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - prefix: - description: Prefix to use for server-side filtering of files in the Bucket. - type: string - provider: - default: generic - description: |- - Provider of the object storage bucket. - Defaults to 'generic', which expects an S3 (API) compatible object - storage. - enum: - - generic - - aws - - gcp - - azure - type: string - proxySecretRef: - description: |- - ProxySecretRef specifies the Secret containing the proxy configuration - to use while communicating with the Bucket server. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - region: - description: Region of the Endpoint where the BucketName is located in. - type: string - secretRef: - description: |- - SecretRef specifies the Secret containing authentication credentials - for the Bucket. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - sts: - description: |- - STS specifies the required configuration to use a Security Token - Service for fetching temporary credentials to authenticate in a - Bucket provider. - - This field is only supported for the `aws` and `generic` providers. - properties: - certSecretRef: - description: |- - CertSecretRef can be given the name of a Secret containing - either or both of - - - a PEM-encoded client certificate (`tls.crt`) and private - key (`tls.key`); - - a PEM-encoded CA certificate (`ca.crt`) - - and whichever are supplied, will be used for connecting to the - STS endpoint. The client cert and key are useful if you are - authenticating with a certificate; the CA cert is useful if - you are using a self-signed server certificate. The Secret must - be of type `Opaque` or `kubernetes.io/tls`. - - This field is only supported for the `ldap` provider. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - endpoint: - description: |- - Endpoint is the HTTP/S endpoint of the Security Token Service from - where temporary credentials will be fetched. - pattern: ^(http|https)://.*$ - type: string - provider: - description: Provider of the Security Token Service. - enum: - - aws - - ldap - type: string - secretRef: - description: |- - SecretRef specifies the Secret containing authentication credentials - for the STS endpoint. This Secret must contain the fields `username` - and `password` and is supported only for the `ldap` provider. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - required: - - endpoint - - provider - type: object - suspend: - description: |- - Suspend tells the controller to suspend the reconciliation of this - Bucket. - type: boolean - timeout: - default: 60s - description: Timeout for fetch operations, defaults to 60s. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$ - type: string - required: - - bucketName - - endpoint - - interval - type: object - x-kubernetes-validations: - - message: STS configuration is only supported for the 'aws' and 'generic' Bucket providers - rule: self.provider == 'aws' || self.provider == 'generic' || !has(self.sts) - - message: '''aws'' is the only supported STS provider for the ''aws'' Bucket provider' - rule: self.provider != 'aws' || !has(self.sts) || self.sts.provider == 'aws' - - message: '''ldap'' is the only supported STS provider for the ''generic'' Bucket provider' - rule: self.provider != 'generic' || !has(self.sts) || self.sts.provider == 'ldap' - - message: spec.sts.secretRef is not required for the 'aws' STS provider - rule: '!has(self.sts) || self.sts.provider != ''aws'' || !has(self.sts.secretRef)' - - message: spec.sts.certSecretRef is not required for the 'aws' STS provider - rule: '!has(self.sts) || self.sts.provider != ''aws'' || !has(self.sts.certSecretRef)' - status: - default: - observedGeneration: -1 - description: BucketStatus records the observed state of a Bucket. - properties: - artifact: - description: Artifact represents the last successful Bucket reconciliation. - properties: - digest: - description: Digest is the digest of the file in the form of ':'. - pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ - type: string - lastUpdateTime: - description: |- - LastUpdateTime is the timestamp corresponding to the last update of the - Artifact. - format: date-time - type: string - metadata: - additionalProperties: - type: string - description: Metadata holds upstream information such as OCI annotations. - type: object - path: - description: |- - Path is the relative file path of the Artifact. It can be used to locate - the file in the root of the Artifact storage on the local file system of - the controller managing the Source. - type: string - revision: - description: |- - Revision is a human-readable identifier traceable in the origin source - system. It can be a Git commit SHA, Git tag, a Helm chart version, etc. - type: string - size: - description: Size is the number of bytes in the file. - format: int64 - type: integer - url: - description: |- - URL is the HTTP address of the Artifact as exposed by the controller - managing the Source. It can be used to retrieve the Artifact for - consumption, e.g. by another controller applying the Artifact contents. - type: string - required: - - digest - - lastUpdateTime - - path - - revision - - url - type: object - conditions: - description: Conditions holds the conditions for the Bucket. - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - observedGeneration: - description: ObservedGeneration is the last observed generation of the Bucket object. - format: int64 - type: integer - observedIgnore: - description: |- - ObservedIgnore is the observed exclusion patterns used for constructing - the source artifact. - type: string - url: - description: |- - URL is the dynamic fetch link for the latest Artifact. - It is provided on a "best effort" basis, and using the precise - BucketStatus.Artifact data is recommended. - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -1436,7 +1072,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: externalartifacts.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -1628,7 +1264,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: gitrepositories.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -2096,464 +1732,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .spec.url - name: URL - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - deprecated: true - deprecationWarning: v1beta2 GitRepository is deprecated, upgrade to v1 - name: v1beta2 - schema: - openAPIV3Schema: - description: GitRepository is the Schema for the gitrepositories API. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: |- - GitRepositorySpec specifies the required configuration to produce an - Artifact for a Git repository. - properties: - accessFrom: - description: |- - AccessFrom specifies an Access Control List for allowing cross-namespace - references to this object. - NOTE: Not implemented, provisional as of https://github.com/fluxcd/flux2/pull/2092 - properties: - namespaceSelectors: - description: |- - NamespaceSelectors is the list of namespace selectors to which this ACL applies. - Items in this list are evaluated using a logical OR operation. - items: - description: |- - NamespaceSelector selects the namespaces to which this ACL applies. - An empty map of MatchLabels matches all namespaces in a cluster. - properties: - matchLabels: - additionalProperties: - type: string - description: |- - MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, whose key field is "key", the - operator is "In", and the values array contains only "value". The requirements are ANDed. - type: object - type: object - type: array - required: - - namespaceSelectors - type: object - gitImplementation: - default: go-git - description: |- - GitImplementation specifies which Git client library implementation to - use. Defaults to 'go-git', valid values are ('go-git', 'libgit2'). - Deprecated: gitImplementation is deprecated now that 'go-git' is the - only supported implementation. - enum: - - go-git - - libgit2 - type: string - ignore: - description: |- - Ignore overrides the set of excluded patterns in the .sourceignore format - (which is the same as .gitignore). If not provided, a default will be used, - consult the documentation for your version to find out what those are. - type: string - include: - description: |- - Include specifies a list of GitRepository resources which Artifacts - should be included in the Artifact produced for this GitRepository. - items: - description: |- - GitRepositoryInclude specifies a local reference to a GitRepository which - Artifact (sub-)contents must be included, and where they should be placed. - properties: - fromPath: - description: |- - FromPath specifies the path to copy contents from, defaults to the root - of the Artifact. - type: string - repository: - description: |- - GitRepositoryRef specifies the GitRepository which Artifact contents - must be included. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - toPath: - description: |- - ToPath specifies the path to copy contents to, defaults to the name of - the GitRepositoryRef. - type: string - required: - - repository - type: object - type: array - interval: - description: Interval at which to check the GitRepository for updates. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - recurseSubmodules: - description: |- - RecurseSubmodules enables the initialization of all submodules within - the GitRepository as cloned from the URL, using their default settings. - type: boolean - ref: - description: |- - Reference specifies the Git reference to resolve and monitor for - changes, defaults to the 'master' branch. - properties: - branch: - description: Branch to check out, defaults to 'master' if no other field is defined. - type: string - commit: - description: |- - Commit SHA to check out, takes precedence over all reference fields. - - This can be combined with Branch to shallow clone the branch, in which - the commit is expected to exist. - type: string - name: - description: |- - Name of the reference to check out; takes precedence over Branch, Tag and SemVer. - - It must be a valid Git reference: https://git-scm.com/docs/git-check-ref-format#_description - Examples: "refs/heads/main", "refs/tags/v0.1.0", "refs/pull/420/head", "refs/merge-requests/1/head" - type: string - semver: - description: SemVer tag expression to check out, takes precedence over Tag. - type: string - tag: - description: Tag to check out, takes precedence over Branch. - type: string - type: object - secretRef: - description: |- - SecretRef specifies the Secret containing authentication credentials for - the GitRepository. - For HTTPS repositories the Secret must contain 'username' and 'password' - fields for basic auth or 'bearerToken' field for token auth. - For SSH repositories the Secret must contain 'identity' - and 'known_hosts' fields. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - suspend: - description: |- - Suspend tells the controller to suspend the reconciliation of this - GitRepository. - type: boolean - timeout: - default: 60s - description: Timeout for Git operations like cloning, defaults to 60s. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$ - type: string - url: - description: URL specifies the Git repository URL, it can be an HTTP/S or SSH address. - pattern: ^(http|https|ssh)://.*$ - type: string - verify: - description: |- - Verification specifies the configuration to verify the Git commit - signature(s). - properties: - mode: - description: Mode specifies what Git object should be verified, currently ('head'). - enum: - - head - type: string - secretRef: - description: |- - SecretRef specifies the Secret containing the public keys of trusted Git - authors. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - required: - - mode - - secretRef - type: object - required: - - interval - - url - type: object - status: - default: - observedGeneration: -1 - description: GitRepositoryStatus records the observed state of a Git repository. - properties: - artifact: - description: Artifact represents the last successful GitRepository reconciliation. - properties: - digest: - description: Digest is the digest of the file in the form of ':'. - pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ - type: string - lastUpdateTime: - description: |- - LastUpdateTime is the timestamp corresponding to the last update of the - Artifact. - format: date-time - type: string - metadata: - additionalProperties: - type: string - description: Metadata holds upstream information such as OCI annotations. - type: object - path: - description: |- - Path is the relative file path of the Artifact. It can be used to locate - the file in the root of the Artifact storage on the local file system of - the controller managing the Source. - type: string - revision: - description: |- - Revision is a human-readable identifier traceable in the origin source - system. It can be a Git commit SHA, Git tag, a Helm chart version, etc. - type: string - size: - description: Size is the number of bytes in the file. - format: int64 - type: integer - url: - description: |- - URL is the HTTP address of the Artifact as exposed by the controller - managing the Source. It can be used to retrieve the Artifact for - consumption, e.g. by another controller applying the Artifact contents. - type: string - required: - - digest - - lastUpdateTime - - path - - revision - - url - type: object - conditions: - description: Conditions holds the conditions for the GitRepository. - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - contentConfigChecksum: - description: |- - ContentConfigChecksum is a checksum of all the configurations related to - the content of the source artifact: - - .spec.ignore - - .spec.recurseSubmodules - - .spec.included and the checksum of the included artifacts - observed in .status.observedGeneration version of the object. This can - be used to determine if the content of the included repository has - changed. - It has the format of `:`, for example: `sha256:`. - - Deprecated: Replaced with explicit fields for observed artifact content - config in the status. - type: string - includedArtifacts: - description: |- - IncludedArtifacts contains a list of the last successfully included - Artifacts as instructed by GitRepositorySpec.Include. - items: - description: Artifact represents the output of a Source reconciliation. - properties: - digest: - description: Digest is the digest of the file in the form of ':'. - pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ - type: string - lastUpdateTime: - description: |- - LastUpdateTime is the timestamp corresponding to the last update of the - Artifact. - format: date-time - type: string - metadata: - additionalProperties: - type: string - description: Metadata holds upstream information such as OCI annotations. - type: object - path: - description: |- - Path is the relative file path of the Artifact. It can be used to locate - the file in the root of the Artifact storage on the local file system of - the controller managing the Source. - type: string - revision: - description: |- - Revision is a human-readable identifier traceable in the origin source - system. It can be a Git commit SHA, Git tag, a Helm chart version, etc. - type: string - size: - description: Size is the number of bytes in the file. - format: int64 - type: integer - url: - description: |- - URL is the HTTP address of the Artifact as exposed by the controller - managing the Source. It can be used to retrieve the Artifact for - consumption, e.g. by another controller applying the Artifact contents. - type: string - required: - - digest - - lastUpdateTime - - path - - revision - - url - type: object - type: array - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - observedGeneration: - description: |- - ObservedGeneration is the last observed generation of the GitRepository - object. - format: int64 - type: integer - observedIgnore: - description: |- - ObservedIgnore is the observed exclusion patterns used for constructing - the source artifact. - type: string - observedInclude: - description: |- - ObservedInclude is the observed list of GitRepository resources used to - to produce the current Artifact. - items: - description: |- - GitRepositoryInclude specifies a local reference to a GitRepository which - Artifact (sub-)contents must be included, and where they should be placed. - properties: - fromPath: - description: |- - FromPath specifies the path to copy contents from, defaults to the root - of the Artifact. - type: string - repository: - description: |- - GitRepositoryRef specifies the GitRepository which Artifact contents - must be included. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - toPath: - description: |- - ToPath specifies the path to copy contents to, defaults to the name of - the GitRepositoryRef. - type: string - required: - - repository - type: object - type: array - observedRecurseSubmodules: - description: |- - ObservedRecurseSubmodules is the observed resource submodules - configuration used to produce the current Artifact. - type: boolean - url: - description: |- - URL is the dynamic fetch link for the latest Artifact. - It is provided on a "best effort" basis, and using the precise - GitRepositoryStatus.Artifact data is recommended. - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -2564,7 +1742,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: helmcharts.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -2757,6 +1935,9 @@ spec: - interval - sourceRef type: object + x-kubernetes-validations: + - message: spec.verify is only supported when spec.sourceRef.kind is 'HelmRepository' + rule: '!has(self.verify) || self.sourceRef.kind == ''HelmRepository''' status: default: observedGeneration: -1 @@ -2906,372 +2087,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .spec.chart - name: Chart - type: string - - jsonPath: .spec.version - name: Version - type: string - - jsonPath: .spec.sourceRef.kind - name: Source Kind - type: string - - jsonPath: .spec.sourceRef.name - name: Source Name - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - deprecated: true - deprecationWarning: v1beta2 HelmChart is deprecated, upgrade to v1 - name: v1beta2 - schema: - openAPIV3Schema: - description: HelmChart is the Schema for the helmcharts API. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: HelmChartSpec specifies the desired state of a Helm chart. - properties: - accessFrom: - description: |- - AccessFrom specifies an Access Control List for allowing cross-namespace - references to this object. - NOTE: Not implemented, provisional as of https://github.com/fluxcd/flux2/pull/2092 - properties: - namespaceSelectors: - description: |- - NamespaceSelectors is the list of namespace selectors to which this ACL applies. - Items in this list are evaluated using a logical OR operation. - items: - description: |- - NamespaceSelector selects the namespaces to which this ACL applies. - An empty map of MatchLabels matches all namespaces in a cluster. - properties: - matchLabels: - additionalProperties: - type: string - description: |- - MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, whose key field is "key", the - operator is "In", and the values array contains only "value". The requirements are ANDed. - type: object - type: object - type: array - required: - - namespaceSelectors - type: object - chart: - description: |- - Chart is the name or path the Helm chart is available at in the - SourceRef. - type: string - ignoreMissingValuesFiles: - description: |- - IgnoreMissingValuesFiles controls whether to silently ignore missing values - files rather than failing. - type: boolean - interval: - description: |- - Interval at which the HelmChart SourceRef is checked for updates. - This interval is approximate and may be subject to jitter to ensure - efficient use of resources. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - reconcileStrategy: - default: ChartVersion - description: |- - ReconcileStrategy determines what enables the creation of a new artifact. - Valid values are ('ChartVersion', 'Revision'). - See the documentation of the values for an explanation on their behavior. - Defaults to ChartVersion when omitted. - enum: - - ChartVersion - - Revision - type: string - sourceRef: - description: SourceRef is the reference to the Source the chart is available at. - properties: - apiVersion: - description: APIVersion of the referent. - type: string - kind: - description: |- - Kind of the referent, valid values are ('HelmRepository', 'GitRepository', - 'Bucket'). - enum: - - HelmRepository - - GitRepository - - Bucket - type: string - name: - description: Name of the referent. - type: string - required: - - kind - - name - type: object - suspend: - description: |- - Suspend tells the controller to suspend the reconciliation of this - source. - type: boolean - valuesFile: - description: |- - ValuesFile is an alternative values file to use as the default chart - values, expected to be a relative path in the SourceRef. Deprecated in - favor of ValuesFiles, for backwards compatibility the file specified here - is merged before the ValuesFiles items. Ignored when omitted. - type: string - valuesFiles: - description: |- - ValuesFiles is an alternative list of values files to use as the chart - values (values.yaml is not included by default), expected to be a - relative path in the SourceRef. - Values files are merged in the order of this list with the last file - overriding the first. Ignored when omitted. - items: - type: string - type: array - verify: - description: |- - Verify contains the secret name containing the trusted public keys - used to verify the signature and specifies which provider to use to check - whether OCI image is authentic. - This field is only supported when using HelmRepository source with spec.type 'oci'. - Chart dependencies, which are not bundled in the umbrella chart artifact, are not verified. - properties: - matchOIDCIdentity: - description: |- - MatchOIDCIdentity specifies the identity matching criteria to use - while verifying an OCI artifact which was signed using Cosign keyless - signing. The artifact's identity is deemed to be verified if any of the - specified matchers match against the identity. - items: - description: |- - OIDCIdentityMatch specifies options for verifying the certificate identity, - i.e. the issuer and the subject of the certificate. - properties: - issuer: - description: |- - Issuer specifies the regex pattern to match against to verify - the OIDC issuer in the Fulcio certificate. The pattern must be a - valid Go regular expression. - type: string - subject: - description: |- - Subject specifies the regex pattern to match against to verify - the identity subject in the Fulcio certificate. The pattern must - be a valid Go regular expression. - type: string - required: - - issuer - - subject - type: object - type: array - provider: - default: cosign - description: Provider specifies the technology used to sign the OCI Artifact. - enum: - - cosign - - notation - type: string - secretRef: - description: |- - SecretRef specifies the Kubernetes Secret containing the - trusted public keys. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - required: - - provider - type: object - version: - default: '*' - description: |- - Version is the chart version semver expression, ignored for charts from - GitRepository and Bucket sources. Defaults to latest when omitted. - type: string - required: - - chart - - interval - - sourceRef - type: object - status: - default: - observedGeneration: -1 - description: HelmChartStatus records the observed state of the HelmChart. - properties: - artifact: - description: Artifact represents the output of the last successful reconciliation. - properties: - digest: - description: Digest is the digest of the file in the form of ':'. - pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ - type: string - lastUpdateTime: - description: |- - LastUpdateTime is the timestamp corresponding to the last update of the - Artifact. - format: date-time - type: string - metadata: - additionalProperties: - type: string - description: Metadata holds upstream information such as OCI annotations. - type: object - path: - description: |- - Path is the relative file path of the Artifact. It can be used to locate - the file in the root of the Artifact storage on the local file system of - the controller managing the Source. - type: string - revision: - description: |- - Revision is a human-readable identifier traceable in the origin source - system. It can be a Git commit SHA, Git tag, a Helm chart version, etc. - type: string - size: - description: Size is the number of bytes in the file. - format: int64 - type: integer - url: - description: |- - URL is the HTTP address of the Artifact as exposed by the controller - managing the Source. It can be used to retrieve the Artifact for - consumption, e.g. by another controller applying the Artifact contents. - type: string - required: - - digest - - lastUpdateTime - - path - - revision - - url - type: object - conditions: - description: Conditions holds the conditions for the HelmChart. - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - observedChartName: - description: |- - ObservedChartName is the last observed chart name as specified by the - resolved chart reference. - type: string - observedGeneration: - description: |- - ObservedGeneration is the last observed generation of the HelmChart - object. - format: int64 - type: integer - observedSourceArtifactRevision: - description: |- - ObservedSourceArtifactRevision is the last observed Artifact.Revision - of the HelmChartSpec.SourceRef. - type: string - observedValuesFiles: - description: |- - ObservedValuesFiles are the observed value files of the last successful - reconciliation. - It matches the chart in the last successfully reconciled artifact. - items: - type: string - type: array - url: - description: |- - URL is the dynamic fetch link for the latest Artifact. - It is provided on a "best effort" basis, and using the precise - BucketStatus.Artifact data is recommended. - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -3282,7 +2097,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: helmreleases.helm.toolkit.fluxcd.io spec: group: helm.toolkit.fluxcd.io @@ -3621,6 +2436,43 @@ spec: - disabled type: string type: object + healthCheckExprs: + description: |- + HealthCheckExprs is a list of healthcheck expressions for evaluating the + health of custom resources using Common Expression Language (CEL). + The expressions are evaluated only when the specific Helm action + taking place has wait enabled, i.e. DisableWait is false, and the + 'poller' WaitStrategy is used. + items: + description: CustomHealthCheck defines the health check for custom resources. + properties: + apiVersion: + description: APIVersion of the custom resource under evaluation. + type: string + current: + description: |- + Current is the CEL expression that determines if the status + of the custom resource has reached the desired state. + type: string + failed: + description: |- + Failed is the CEL expression that determines if the status + of the custom resource has failed to reach the desired state. + type: string + inProgress: + description: |- + InProgress is the CEL expression that determines if the status + of the custom resource has not yet reached the desired state. + type: string + kind: + description: Kind of the custom resource under evaluation. + type: string + required: + - apiVersion + - current + - kind + type: object + type: array install: description: Install holds the configuration for Helm install actions for this HelmRelease. properties: @@ -3709,6 +2561,11 @@ spec: Replace tells the Helm install action to re-use the 'ReleaseName', but only if that name is a deleted release which remains in the history. type: boolean + serverSideApply: + description: |- + ServerSideApply enables server-side apply for resources during install. + Defaults to true (or false when UseHelm3Defaults feature gate is enabled). + type: boolean skipCRDs: description: |- SkipCRDs tells the Helm install action to not install any CRDs. By default, @@ -3975,8 +2832,28 @@ spec: description: Force forces resource updates through a replacement strategy. type: boolean recreate: - description: Recreate performs pod restarts for the resource if applicable. + description: |- + Recreate performs pod restarts for any managed workloads. + + Deprecated: This behavior was deprecated in Helm 3: + - Deprecation: https://github.com/helm/helm/pull/6463 + - Removal: https://github.com/helm/helm/pull/31023 + After helm-controller was upgraded to the Helm 4 SDK, + this field is no longer functional and will print a + warning if set to true. It will also be removed in a + future release. type: boolean + serverSideApply: + description: |- + ServerSideApply enables server-side apply for resources during rollback. + Can be "enabled", "disabled", or "auto". + When "auto", server-side apply usage will be based on the release's previous usage. + Defaults to "auto". + enum: + - enabled + - disabled + - auto + type: string timeout: description: |- Timeout is the time to wait for any individual Kubernetes operation (like @@ -4185,6 +3062,17 @@ spec: - uninstall type: string type: object + serverSideApply: + description: |- + ServerSideApply enables server-side apply for resources during upgrade. + Can be "enabled", "disabled", or "auto". + When "auto", server-side apply usage will be based on the release's previous usage. + Defaults to "auto". + enum: + - enabled + - disabled + - auto + type: string strategy: description: |- Strategy defines the upgrade strategy to use for this HelmRelease. @@ -4268,6 +3156,26 @@ spec: - name type: object type: array + waitStrategy: + description: |- + WaitStrategy defines Helm's wait strategy for waiting for applied + resources to become ready. + properties: + name: + description: |- + Name is Helm's wait strategy for waiting for applied resources to + become ready. One of 'poller' or 'legacy'. The 'poller' strategy uses + kstatus to poll resource statuses, while the 'legacy' strategy uses + Helm v3's waiting logic. + Defaults to 'poller', or to 'legacy' when UseHelm3Defaults feature + gate is enabled. + enum: + - poller + - legacy + type: string + required: + - name + type: object required: - interval type: object @@ -4355,11 +3263,14 @@ spec: Snapshot captures a point-in-time copy of the status information for a Helm release, as managed by the controller. properties: + action: + description: Action is the action that resulted in this snapshot being created. + type: string apiVersion: description: |- APIVersion is the API version of the Snapshot. - Provisional: when the calculation method of the Digest field is changed, - this field will be used to distinguish between the old and new methods. + When the calculation method of the Digest field is changed, this + field will be used to distinguish between the old and new methods. type: string appVersion: description: AppVersion is the chart app version of the release object in storage. @@ -4451,6 +3362,32 @@ spec: state. It is reset after a successful reconciliation. format: int64 type: integer + inventory: + description: |- + Inventory contains the list of Kubernetes resource object references + that have been applied for this release. + properties: + entries: + description: Entries of Kubernetes resource object references. + items: + description: ResourceRef contains the information necessary to locate a resource within a cluster. + properties: + id: + description: |- + ID is the string representation of the Kubernetes resource object's metadata, + in the format '___'. + type: string + v: + description: Version is the API version of the Kubernetes resource object's kind. + type: string + required: + - id + - v + type: object + type: array + required: + - entries + type: object lastAttemptedConfigDigest: description: |- LastAttemptedConfigDigest is the digest for the config (better known as @@ -4550,1276 +3487,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - deprecated: true - deprecationWarning: v2beta2 HelmRelease is deprecated, upgrade to v2 - name: v2beta2 - schema: - openAPIV3Schema: - description: HelmRelease is the Schema for the helmreleases API - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: HelmReleaseSpec defines the desired state of a Helm release. - properties: - chart: - description: |- - Chart defines the template of the v1beta2.HelmChart that should be created - for this HelmRelease. - properties: - metadata: - description: ObjectMeta holds the template for metadata like labels and annotations. - properties: - annotations: - additionalProperties: - type: string - description: |- - Annotations is an unstructured key value map stored with a resource that may be - set by external tools to store and retrieve arbitrary metadata. They are not - queryable and should be preserved when modifying objects. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - type: object - labels: - additionalProperties: - type: string - description: |- - Map of string keys and values that can be used to organize and categorize - (scope and select) objects. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ - type: object - type: object - spec: - description: Spec holds the template for the v1beta2.HelmChartSpec for this HelmRelease. - properties: - chart: - description: The name or path the Helm chart is available at in the SourceRef. - maxLength: 2048 - minLength: 1 - type: string - ignoreMissingValuesFiles: - description: IgnoreMissingValuesFiles controls whether to silently ignore missing values files rather than failing. - type: boolean - interval: - description: |- - Interval at which to check the v1.Source for updates. Defaults to - 'HelmReleaseSpec.Interval'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - reconcileStrategy: - default: ChartVersion - description: |- - Determines what enables the creation of a new artifact. Valid values are - ('ChartVersion', 'Revision'). - See the documentation of the values for an explanation on their behavior. - Defaults to ChartVersion when omitted. - enum: - - ChartVersion - - Revision - type: string - sourceRef: - description: The name and namespace of the v1.Source the chart is available at. - properties: - apiVersion: - description: APIVersion of the referent. - type: string - kind: - description: Kind of the referent. - enum: - - HelmRepository - - GitRepository - - Bucket - type: string - name: - description: Name of the referent. - maxLength: 253 - minLength: 1 - type: string - namespace: - description: Namespace of the referent. - maxLength: 63 - minLength: 1 - type: string - required: - - kind - - name - type: object - valuesFile: - description: |- - Alternative values file to use as the default chart values, expected to - be a relative path in the SourceRef. Deprecated in favor of ValuesFiles, - for backwards compatibility the file defined here is merged before the - ValuesFiles items. Ignored when omitted. - type: string - valuesFiles: - description: |- - Alternative list of values files to use as the chart values (values.yaml - is not included by default), expected to be a relative path in the SourceRef. - Values files are merged in the order of this list with the last file overriding - the first. Ignored when omitted. - items: - type: string - type: array - verify: - description: |- - Verify contains the secret name containing the trusted public keys - used to verify the signature and specifies which provider to use to check - whether OCI image is authentic. - This field is only supported for OCI sources. - Chart dependencies, which are not bundled in the umbrella chart artifact, - are not verified. - properties: - provider: - default: cosign - description: Provider specifies the technology used to sign the OCI Helm chart. - enum: - - cosign - - notation - type: string - secretRef: - description: |- - SecretRef specifies the Kubernetes Secret containing the - trusted public keys. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - required: - - provider - type: object - version: - default: '*' - description: |- - Version semver expression, ignored for charts from v1beta2.GitRepository and - v1beta2.Bucket sources. Defaults to latest when omitted. - type: string - required: - - chart - - sourceRef - type: object - required: - - spec - type: object - chartRef: - description: |- - ChartRef holds a reference to a source controller resource containing the - Helm chart artifact. - - Note: this field is provisional to the v2 API, and not actively used - by v2beta2 HelmReleases. - properties: - apiVersion: - description: APIVersion of the referent. - type: string - kind: - description: Kind of the referent. - enum: - - OCIRepository - - HelmChart - type: string - name: - description: Name of the referent. - maxLength: 253 - minLength: 1 - type: string - namespace: - description: |- - Namespace of the referent, defaults to the namespace of the Kubernetes - resource object that contains the reference. - maxLength: 63 - minLength: 1 - type: string - required: - - kind - - name - type: object - dependsOn: - description: |- - DependsOn may contain a meta.NamespacedObjectReference slice with - references to HelmRelease resources that must be ready before this HelmRelease - can be reconciled. - items: - description: |- - NamespacedObjectReference contains enough information to locate the referenced Kubernetes resource object in any - namespace. - properties: - name: - description: Name of the referent. - type: string - namespace: - description: Namespace of the referent, when not specified it acts as LocalObjectReference. - type: string - required: - - name - type: object - type: array - driftDetection: - description: |- - DriftDetection holds the configuration for detecting and handling - differences between the manifest in the Helm storage and the resources - currently existing in the cluster. - properties: - ignore: - description: |- - Ignore contains a list of rules for specifying which changes to ignore - during diffing. - items: - description: |- - IgnoreRule defines a rule to selectively disregard specific changes during - the drift detection process. - properties: - paths: - description: |- - Paths is a list of JSON Pointer (RFC 6901) paths to be excluded from - consideration in a Kubernetes object. - items: - type: string - type: array - target: - description: |- - Target is a selector for specifying Kubernetes objects to which this - rule applies. - If Target is not set, the Paths will be ignored for all Kubernetes - objects within the manifest of the Helm release. - properties: - annotationSelector: - description: |- - AnnotationSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource annotations. - type: string - group: - description: |- - Group is the API group to select resources from. - Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - kind: - description: |- - Kind of the API Group to select resources from. - Together with Group and Version it is capable of unambiguously - identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - labelSelector: - description: |- - LabelSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource labels. - type: string - name: - description: Name to match resources with. - type: string - namespace: - description: Namespace to select resources from. - type: string - version: - description: |- - Version of the API Group to select resources from. - Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - type: object - required: - - paths - type: object - type: array - mode: - description: |- - Mode defines how differences should be handled between the Helm manifest - and the manifest currently applied to the cluster. - If not explicitly set, it defaults to DiffModeDisabled. - enum: - - enabled - - warn - - disabled - type: string - type: object - install: - description: Install holds the configuration for Helm install actions for this HelmRelease. - properties: - crds: - description: |- - CRDs upgrade CRDs from the Helm Chart's crds directory according - to the CRD upgrade policy provided here. Valid values are `Skip`, - `Create` or `CreateReplace`. Default is `Create` and if omitted - CRDs are installed but not updated. - - Skip: do neither install nor replace (update) any CRDs. - - Create: new CRDs are created, existing CRDs are neither updated nor deleted. - - CreateReplace: new CRDs are created, existing CRDs are updated (replaced) - but not deleted. - - By default, CRDs are applied (installed) during Helm install action. - With this option users can opt in to CRD replace existing CRDs on Helm - install actions, which is not (yet) natively supported by Helm. - https://helm.sh/docs/chart_best_practices/custom_resource_definitions. - enum: - - Skip - - Create - - CreateReplace - type: string - createNamespace: - description: |- - CreateNamespace tells the Helm install action to create the - HelmReleaseSpec.TargetNamespace if it does not exist yet. - On uninstall, the namespace will not be garbage collected. - type: boolean - disableHooks: - description: DisableHooks prevents hooks from running during the Helm install action. - type: boolean - disableOpenAPIValidation: - description: |- - DisableOpenAPIValidation prevents the Helm install action from validating - rendered templates against the Kubernetes OpenAPI Schema. - type: boolean - disableWait: - description: |- - DisableWait disables the waiting for resources to be ready after a Helm - install has been performed. - type: boolean - disableWaitForJobs: - description: |- - DisableWaitForJobs disables waiting for jobs to complete after a Helm - install has been performed. - type: boolean - remediation: - description: |- - Remediation holds the remediation configuration for when the Helm install - action for the HelmRelease fails. The default is to not perform any action. - properties: - ignoreTestFailures: - description: |- - IgnoreTestFailures tells the controller to skip remediation when the Helm - tests are run after an install action but fail. Defaults to - 'Test.IgnoreFailures'. - type: boolean - remediateLastFailure: - description: |- - RemediateLastFailure tells the controller to remediate the last failure, when - no retries remain. Defaults to 'false'. - type: boolean - retries: - description: |- - Retries is the number of retries that should be attempted on failures before - bailing. Remediation, using an uninstall, is performed between each attempt. - Defaults to '0', a negative integer equals to unlimited retries. - type: integer - type: object - replace: - description: |- - Replace tells the Helm install action to re-use the 'ReleaseName', but only - if that name is a deleted release which remains in the history. - type: boolean - skipCRDs: - description: |- - SkipCRDs tells the Helm install action to not install any CRDs. By default, - CRDs are installed if not already present. - - Deprecated use CRD policy (`crds`) attribute with value `Skip` instead. - type: boolean - timeout: - description: |- - Timeout is the time to wait for any individual Kubernetes operation (like - Jobs for hooks) during the performance of a Helm install action. Defaults to - 'HelmReleaseSpec.Timeout'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - type: object - interval: - description: Interval at which to reconcile the Helm release. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - kubeConfig: - description: |- - KubeConfig for reconciling the HelmRelease on a remote cluster. - When used in combination with HelmReleaseSpec.ServiceAccountName, - forces the controller to act on behalf of that Service Account at the - target cluster. - If the --default-service-account flag is set, its value will be used as - a controller level fallback for when HelmReleaseSpec.ServiceAccountName - is empty. - properties: - configMapRef: - description: |- - ConfigMapRef holds an optional name of a ConfigMap that contains - the following keys: - - - `provider`: the provider to use. One of `aws`, `azure`, `gcp`, or - `generic`. Required. - - `cluster`: the fully qualified resource name of the Kubernetes - cluster in the cloud provider API. Not used by the `generic` - provider. Required when one of `address` or `ca.crt` is not set. - - `address`: the address of the Kubernetes API server. Required - for `generic`. For the other providers, if not specified, the - first address in the cluster resource will be used, and if - specified, it must match one of the addresses in the cluster - resource. - If audiences is not set, will be used as the audience for the - `generic` provider. - - `ca.crt`: the optional PEM-encoded CA certificate for the - Kubernetes API server. If not set, the controller will use the - CA certificate from the cluster resource. - - `audiences`: the optional audiences as a list of - line-break-separated strings for the Kubernetes ServiceAccount - token. Defaults to the `address` for the `generic` provider, or - to specific values for the other providers depending on the - provider. - - `serviceAccountName`: the optional name of the Kubernetes - ServiceAccount in the same namespace that should be used - for authentication. If not specified, the controller - ServiceAccount will be used. - - Mutually exclusive with SecretRef. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - secretRef: - description: |- - SecretRef holds an optional name of a secret that contains a key with - the kubeconfig file as the value. If no key is set, the key will default - to 'value'. Mutually exclusive with ConfigMapRef. - It is recommended that the kubeconfig is self-contained, and the secret - is regularly updated if credentials such as a cloud-access-token expire. - Cloud specific `cmd-path` auth helpers will not function without adding - binaries and credentials to the Pod that is responsible for reconciling - Kubernetes resources. Supported only for the generic provider. - properties: - key: - description: Key in the Secret, when not specified an implementation-specific default key is used. - type: string - name: - description: Name of the Secret. - type: string - required: - - name - type: object - type: object - x-kubernetes-validations: - - message: exactly one of spec.kubeConfig.configMapRef or spec.kubeConfig.secretRef must be specified - rule: has(self.configMapRef) || has(self.secretRef) - - message: exactly one of spec.kubeConfig.configMapRef or spec.kubeConfig.secretRef must be specified - rule: '!has(self.configMapRef) || !has(self.secretRef)' - maxHistory: - description: |- - MaxHistory is the number of revisions saved by Helm for this HelmRelease. - Use '0' for an unlimited number of revisions; defaults to '5'. - type: integer - persistentClient: - description: |- - PersistentClient tells the controller to use a persistent Kubernetes - client for this release. When enabled, the client will be reused for the - duration of the reconciliation, instead of being created and destroyed - for each (step of a) Helm action. - - This can improve performance, but may cause issues with some Helm charts - that for example do create Custom Resource Definitions during installation - outside Helm's CRD lifecycle hooks, which are then not observed to be - available by e.g. post-install hooks. - - If not set, it defaults to true. - type: boolean - postRenderers: - description: |- - PostRenderers holds an array of Helm PostRenderers, which will be applied in order - of their definition. - items: - description: PostRenderer contains a Helm PostRenderer specification. - properties: - kustomize: - description: Kustomization to apply as PostRenderer. - properties: - images: - description: |- - Images is a list of (image name, new name, new tag or digest) - for changing image names, tags or digests. This can also be achieved with a - patch, but this operator is simpler to specify. - items: - description: Image contains an image name, a new name, a new tag or digest, which will replace the original name and tag. - properties: - digest: - description: |- - Digest is the value used to replace the original image tag. - If digest is present NewTag value is ignored. - type: string - name: - description: Name is a tag-less image name. - type: string - newName: - description: NewName is the value used to replace the original name. - type: string - newTag: - description: NewTag is the value used to replace the original tag. - type: string - required: - - name - type: object - type: array - patches: - description: |- - Strategic merge and JSON patches, defined as inline YAML objects, - capable of targeting objects based on kind, label and annotation selectors. - items: - description: |- - Patch contains an inline StrategicMerge or JSON6902 patch, and the target the patch should - be applied to. - properties: - patch: - description: |- - Patch contains an inline StrategicMerge patch or an inline JSON6902 patch with - an array of operation objects. - type: string - target: - description: Target points to the resources that the patch document should be applied to. - properties: - annotationSelector: - description: |- - AnnotationSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource annotations. - type: string - group: - description: |- - Group is the API group to select resources from. - Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - kind: - description: |- - Kind of the API Group to select resources from. - Together with Group and Version it is capable of unambiguously - identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - labelSelector: - description: |- - LabelSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource labels. - type: string - name: - description: Name to match resources with. - type: string - namespace: - description: Namespace to select resources from. - type: string - version: - description: |- - Version of the API Group to select resources from. - Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - type: object - required: - - patch - type: object - type: array - patchesJson6902: - description: |- - JSON 6902 patches, defined as inline YAML objects. - - Deprecated: use Patches instead. - items: - description: JSON6902Patch contains a JSON6902 patch and the target the patch should be applied to. - properties: - patch: - description: Patch contains the JSON6902 patch document with an array of operation objects. - items: - description: |- - JSON6902 is a JSON6902 operation object. - https://datatracker.ietf.org/doc/html/rfc6902#section-4 - properties: - from: - description: |- - From contains a JSON-pointer value that references a location within the target document where the operation is - performed. The meaning of the value depends on the value of Op, and is NOT taken into account by all operations. - type: string - op: - description: |- - Op indicates the operation to perform. Its value MUST be one of "add", "remove", "replace", "move", "copy", or - "test". - https://datatracker.ietf.org/doc/html/rfc6902#section-4 - enum: - - test - - remove - - add - - replace - - move - - copy - type: string - path: - description: |- - Path contains the JSON-pointer value that references a location within the target document where the operation - is performed. The meaning of the value depends on the value of Op. - type: string - value: - description: |- - Value contains a valid JSON structure. The meaning of the value depends on the value of Op, and is NOT taken into - account by all operations. - x-kubernetes-preserve-unknown-fields: true - required: - - op - - path - type: object - type: array - target: - description: Target points to the resources that the patch document should be applied to. - properties: - annotationSelector: - description: |- - AnnotationSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource annotations. - type: string - group: - description: |- - Group is the API group to select resources from. - Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - kind: - description: |- - Kind of the API Group to select resources from. - Together with Group and Version it is capable of unambiguously - identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - labelSelector: - description: |- - LabelSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource labels. - type: string - name: - description: Name to match resources with. - type: string - namespace: - description: Namespace to select resources from. - type: string - version: - description: |- - Version of the API Group to select resources from. - Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - type: object - required: - - patch - - target - type: object - type: array - patchesStrategicMerge: - description: |- - Strategic merge patches, defined as inline YAML objects. - - Deprecated: use Patches instead. - items: - x-kubernetes-preserve-unknown-fields: true - type: array - type: object - type: object - type: array - releaseName: - description: |- - ReleaseName used for the Helm release. Defaults to a composition of - '[TargetNamespace-]Name'. - maxLength: 53 - minLength: 1 - type: string - rollback: - description: Rollback holds the configuration for Helm rollback actions for this HelmRelease. - properties: - cleanupOnFail: - description: |- - CleanupOnFail allows deletion of new resources created during the Helm - rollback action when it fails. - type: boolean - disableHooks: - description: DisableHooks prevents hooks from running during the Helm rollback action. - type: boolean - disableWait: - description: |- - DisableWait disables the waiting for resources to be ready after a Helm - rollback has been performed. - type: boolean - disableWaitForJobs: - description: |- - DisableWaitForJobs disables waiting for jobs to complete after a Helm - rollback has been performed. - type: boolean - force: - description: Force forces resource updates through a replacement strategy. - type: boolean - recreate: - description: Recreate performs pod restarts for the resource if applicable. - type: boolean - timeout: - description: |- - Timeout is the time to wait for any individual Kubernetes operation (like - Jobs for hooks) during the performance of a Helm rollback action. Defaults to - 'HelmReleaseSpec.Timeout'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - type: object - serviceAccountName: - description: |- - The name of the Kubernetes service account to impersonate - when reconciling this HelmRelease. - maxLength: 253 - minLength: 1 - type: string - storageNamespace: - description: |- - StorageNamespace used for the Helm storage. - Defaults to the namespace of the HelmRelease. - maxLength: 63 - minLength: 1 - type: string - suspend: - description: |- - Suspend tells the controller to suspend reconciliation for this HelmRelease, - it does not apply to already started reconciliations. Defaults to false. - type: boolean - targetNamespace: - description: |- - TargetNamespace to target when performing operations for the HelmRelease. - Defaults to the namespace of the HelmRelease. - maxLength: 63 - minLength: 1 - type: string - test: - description: Test holds the configuration for Helm test actions for this HelmRelease. - properties: - enable: - description: |- - Enable enables Helm test actions for this HelmRelease after an Helm install - or upgrade action has been performed. - type: boolean - filters: - description: Filters is a list of tests to run or exclude from running. - items: - description: Filter holds the configuration for individual Helm test filters. - properties: - exclude: - description: Exclude specifies whether the named test should be excluded. - type: boolean - name: - description: Name is the name of the test. - maxLength: 253 - minLength: 1 - type: string - required: - - name - type: object - type: array - ignoreFailures: - description: |- - IgnoreFailures tells the controller to skip remediation when the Helm tests - are run but fail. Can be overwritten for tests run after install or upgrade - actions in 'Install.IgnoreTestFailures' and 'Upgrade.IgnoreTestFailures'. - type: boolean - timeout: - description: |- - Timeout is the time to wait for any individual Kubernetes operation during - the performance of a Helm test action. Defaults to 'HelmReleaseSpec.Timeout'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - type: object - timeout: - description: |- - Timeout is the time to wait for any individual Kubernetes operation (like Jobs - for hooks) during the performance of a Helm action. Defaults to '5m0s'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - uninstall: - description: Uninstall holds the configuration for Helm uninstall actions for this HelmRelease. - properties: - deletionPropagation: - default: background - description: |- - DeletionPropagation specifies the deletion propagation policy when - a Helm uninstall is performed. - enum: - - background - - foreground - - orphan - type: string - disableHooks: - description: DisableHooks prevents hooks from running during the Helm rollback action. - type: boolean - disableWait: - description: |- - DisableWait disables waiting for all the resources to be deleted after - a Helm uninstall is performed. - type: boolean - keepHistory: - description: |- - KeepHistory tells Helm to remove all associated resources and mark the - release as deleted, but retain the release history. - type: boolean - timeout: - description: |- - Timeout is the time to wait for any individual Kubernetes operation (like - Jobs for hooks) during the performance of a Helm uninstall action. Defaults - to 'HelmReleaseSpec.Timeout'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - type: object - upgrade: - description: Upgrade holds the configuration for Helm upgrade actions for this HelmRelease. - properties: - cleanupOnFail: - description: |- - CleanupOnFail allows deletion of new resources created during the Helm - upgrade action when it fails. - type: boolean - crds: - description: |- - CRDs upgrade CRDs from the Helm Chart's crds directory according - to the CRD upgrade policy provided here. Valid values are `Skip`, - `Create` or `CreateReplace`. Default is `Skip` and if omitted - CRDs are neither installed nor upgraded. - - Skip: do neither install nor replace (update) any CRDs. - - Create: new CRDs are created, existing CRDs are neither updated nor deleted. - - CreateReplace: new CRDs are created, existing CRDs are updated (replaced) - but not deleted. - - By default, CRDs are not applied during Helm upgrade action. With this - option users can opt-in to CRD upgrade, which is not (yet) natively supported by Helm. - https://helm.sh/docs/chart_best_practices/custom_resource_definitions. - enum: - - Skip - - Create - - CreateReplace - type: string - disableHooks: - description: DisableHooks prevents hooks from running during the Helm upgrade action. - type: boolean - disableOpenAPIValidation: - description: |- - DisableOpenAPIValidation prevents the Helm upgrade action from validating - rendered templates against the Kubernetes OpenAPI Schema. - type: boolean - disableWait: - description: |- - DisableWait disables the waiting for resources to be ready after a Helm - upgrade has been performed. - type: boolean - disableWaitForJobs: - description: |- - DisableWaitForJobs disables waiting for jobs to complete after a Helm - upgrade has been performed. - type: boolean - force: - description: Force forces resource updates through a replacement strategy. - type: boolean - preserveValues: - description: |- - PreserveValues will make Helm reuse the last release's values and merge in - overrides from 'Values'. Setting this flag makes the HelmRelease - non-declarative. - type: boolean - remediation: - description: |- - Remediation holds the remediation configuration for when the Helm upgrade - action for the HelmRelease fails. The default is to not perform any action. - properties: - ignoreTestFailures: - description: |- - IgnoreTestFailures tells the controller to skip remediation when the Helm - tests are run after an upgrade action but fail. - Defaults to 'Test.IgnoreFailures'. - type: boolean - remediateLastFailure: - description: |- - RemediateLastFailure tells the controller to remediate the last failure, when - no retries remain. Defaults to 'false' unless 'Retries' is greater than 0. - type: boolean - retries: - description: |- - Retries is the number of retries that should be attempted on failures before - bailing. Remediation, using 'Strategy', is performed between each attempt. - Defaults to '0', a negative integer equals to unlimited retries. - type: integer - strategy: - description: Strategy to use for failure remediation. Defaults to 'rollback'. - enum: - - rollback - - uninstall - type: string - type: object - timeout: - description: |- - Timeout is the time to wait for any individual Kubernetes operation (like - Jobs for hooks) during the performance of a Helm upgrade action. Defaults to - 'HelmReleaseSpec.Timeout'. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - type: object - values: - description: Values holds the values for this Helm release. - x-kubernetes-preserve-unknown-fields: true - valuesFrom: - description: |- - ValuesFrom holds references to resources containing Helm values for this HelmRelease, - and information about how they should be merged. - items: - description: |- - ValuesReference contains a reference to a resource containing Helm values, - and optionally the key they can be found at. - properties: - kind: - description: Kind of the values referent, valid values are ('Secret', 'ConfigMap'). - enum: - - Secret - - ConfigMap - type: string - name: - description: |- - Name of the values referent. Should reside in the same namespace as the - referring resource. - maxLength: 253 - minLength: 1 - type: string - optional: - description: |- - Optional marks this ValuesReference as optional. When set, a not found error - for the values reference is ignored, but any ValuesKey, TargetPath or - transient error will still result in a reconciliation failure. - type: boolean - targetPath: - description: |- - TargetPath is the YAML dot notation path the value should be merged at. When - set, the ValuesKey is expected to be a single flat value. Defaults to 'None', - which results in the values getting merged at the root. - maxLength: 250 - pattern: ^([a-zA-Z0-9_\-.\\\/]|\[[0-9]{1,5}\])+$ - type: string - valuesKey: - description: |- - ValuesKey is the data key where the values.yaml or a specific value can be - found at. Defaults to 'values.yaml'. - maxLength: 253 - pattern: ^[\-._a-zA-Z0-9]+$ - type: string - required: - - kind - - name - type: object - type: array - required: - - interval - type: object - x-kubernetes-validations: - - message: either chart or chartRef must be set - rule: (has(self.chart) && !has(self.chartRef)) || (!has(self.chart) && has(self.chartRef)) - status: - default: - observedGeneration: -1 - description: HelmReleaseStatus defines the observed state of a HelmRelease. - properties: - conditions: - description: Conditions holds the conditions for the HelmRelease. - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - failures: - description: |- - Failures is the reconciliation failure count against the latest desired - state. It is reset after a successful reconciliation. - format: int64 - type: integer - helmChart: - description: |- - HelmChart is the namespaced name of the HelmChart resource created by - the controller for the HelmRelease. - type: string - history: - description: |- - History holds the history of Helm releases performed for this HelmRelease - up to the last successfully completed release. - items: - description: |- - Snapshot captures a point-in-time copy of the status information for a Helm release, - as managed by the controller. - properties: - apiVersion: - description: |- - APIVersion is the API version of the Snapshot. - Provisional: when the calculation method of the Digest field is changed, - this field will be used to distinguish between the old and new methods. - type: string - appVersion: - description: AppVersion is the chart app version of the release object in storage. - type: string - chartName: - description: ChartName is the chart name of the release object in storage. - type: string - chartVersion: - description: |- - ChartVersion is the chart version of the release object in - storage. - type: string - configDigest: - description: |- - ConfigDigest is the checksum of the config (better known as - "values") of the release object in storage. - It has the format of `:`. - type: string - deleted: - description: Deleted is when the release was deleted. - format: date-time - type: string - digest: - description: |- - Digest is the checksum of the release object in storage. - It has the format of `:`. - type: string - firstDeployed: - description: FirstDeployed is when the release was first deployed. - format: date-time - type: string - lastDeployed: - description: LastDeployed is when the release was last deployed. - format: date-time - type: string - name: - description: Name is the name of the release. - type: string - namespace: - description: Namespace is the namespace the release is deployed to. - type: string - ociDigest: - description: OCIDigest is the digest of the OCI artifact associated with the release. - type: string - status: - description: Status is the current state of the release. - type: string - testHooks: - additionalProperties: - description: |- - TestHookStatus holds the status information for a test hook as observed - to be run by the controller. - properties: - lastCompleted: - description: LastCompleted is the time the test hook last completed. - format: date-time - type: string - lastStarted: - description: LastStarted is the time the test hook was last started. - format: date-time - type: string - phase: - description: Phase the test hook was observed to be in. - type: string - type: object - description: |- - TestHooks is the list of test hooks for the release as observed to be - run by the controller. - type: object - version: - description: Version is the version of the release object in storage. - type: integer - required: - - chartName - - chartVersion - - configDigest - - digest - - firstDeployed - - lastDeployed - - name - - namespace - - status - - version - type: object - type: array - installFailures: - description: |- - InstallFailures is the install failure count against the latest desired - state. It is reset after a successful reconciliation. - format: int64 - type: integer - lastAppliedRevision: - description: |- - LastAppliedRevision is the revision of the last successfully applied - source. - - Deprecated: the revision can now be found in the History. - type: string - lastAttemptedConfigDigest: - description: |- - LastAttemptedConfigDigest is the digest for the config (better known as - "values") of the last reconciliation attempt. - type: string - lastAttemptedGeneration: - description: |- - LastAttemptedGeneration is the last generation the controller attempted - to reconcile. - format: int64 - type: integer - lastAttemptedReleaseAction: - description: |- - LastAttemptedReleaseAction is the last release action performed for this - HelmRelease. It is used to determine the active remediation strategy. - enum: - - install - - upgrade - type: string - lastAttemptedRevision: - description: |- - LastAttemptedRevision is the Source revision of the last reconciliation - attempt. For OCIRepository sources, the 12 first characters of the digest are - appended to the chart version e.g. "1.2.3+1234567890ab". - type: string - lastAttemptedRevisionDigest: - description: |- - LastAttemptedRevisionDigest is the digest of the last reconciliation attempt. - This is only set for OCIRepository sources. - type: string - lastAttemptedValuesChecksum: - description: |- - LastAttemptedValuesChecksum is the SHA1 checksum for the values of the last - reconciliation attempt. - - Deprecated: Use LastAttemptedConfigDigest instead. - type: string - lastHandledForceAt: - description: |- - LastHandledForceAt holds the value of the most recent force request - value, so a change of the annotation value can be detected. - type: string - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - lastHandledResetAt: - description: |- - LastHandledResetAt holds the value of the most recent reset request - value, so a change of the annotation value can be detected. - type: string - lastReleaseRevision: - description: |- - LastReleaseRevision is the revision of the last successful Helm release. - - Deprecated: Use History instead. - type: integer - observedGeneration: - description: ObservedGeneration is the last observed generation. - format: int64 - type: integer - observedPostRenderersDigest: - description: |- - ObservedPostRenderersDigest is the digest for the post-renderers of - the last successful reconciliation attempt. - type: string - storageNamespace: - description: |- - StorageNamespace is the namespace of the Helm release storage for the - current release. - maxLength: 63 - minLength: 1 - type: string - upgradeFailures: - description: |- - UpgradeFailures is the upgrade failure count against the latest desired - state. It is reset after a successful reconciliation. - format: int64 - type: integer - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -5830,7 +3497,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: helmrepositories.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -6144,309 +3811,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .spec.url - name: URL - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - deprecated: true - deprecationWarning: v1beta2 HelmRepository is deprecated, upgrade to v1 - name: v1beta2 - schema: - openAPIV3Schema: - description: HelmRepository is the Schema for the helmrepositories API. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: |- - HelmRepositorySpec specifies the required configuration to produce an - Artifact for a Helm repository index YAML. - properties: - accessFrom: - description: |- - AccessFrom specifies an Access Control List for allowing cross-namespace - references to this object. - NOTE: Not implemented, provisional as of https://github.com/fluxcd/flux2/pull/2092 - properties: - namespaceSelectors: - description: |- - NamespaceSelectors is the list of namespace selectors to which this ACL applies. - Items in this list are evaluated using a logical OR operation. - items: - description: |- - NamespaceSelector selects the namespaces to which this ACL applies. - An empty map of MatchLabels matches all namespaces in a cluster. - properties: - matchLabels: - additionalProperties: - type: string - description: |- - MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, whose key field is "key", the - operator is "In", and the values array contains only "value". The requirements are ANDed. - type: object - type: object - type: array - required: - - namespaceSelectors - type: object - certSecretRef: - description: |- - CertSecretRef can be given the name of a Secret containing - either or both of - - - a PEM-encoded client certificate (`tls.crt`) and private - key (`tls.key`); - - a PEM-encoded CA certificate (`ca.crt`) - - and whichever are supplied, will be used for connecting to the - registry. The client cert and key are useful if you are - authenticating with a certificate; the CA cert is useful if - you are using a self-signed server certificate. The Secret must - be of type `Opaque` or `kubernetes.io/tls`. - - It takes precedence over the values specified in the Secret referred - to by `.spec.secretRef`. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - insecure: - description: |- - Insecure allows connecting to a non-TLS HTTP container registry. - This field is only taken into account if the .spec.type field is set to 'oci'. - type: boolean - interval: - description: |- - Interval at which the HelmRepository URL is checked for updates. - This interval is approximate and may be subject to jitter to ensure - efficient use of resources. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - passCredentials: - description: |- - PassCredentials allows the credentials from the SecretRef to be passed - on to a host that does not match the host as defined in URL. - This may be required if the host of the advertised chart URLs in the - index differ from the defined URL. - Enabling this should be done with caution, as it can potentially result - in credentials getting stolen in a MITM-attack. - type: boolean - provider: - default: generic - description: |- - Provider used for authentication, can be 'aws', 'azure', 'gcp' or 'generic'. - This field is optional, and only taken into account if the .spec.type field is set to 'oci'. - When not specified, defaults to 'generic'. - enum: - - generic - - aws - - azure - - gcp - type: string - secretRef: - description: |- - SecretRef specifies the Secret containing authentication credentials - for the HelmRepository. - For HTTP/S basic auth the secret must contain 'username' and 'password' - fields. - Support for TLS auth using the 'certFile' and 'keyFile', and/or 'caFile' - keys is deprecated. Please use `.spec.certSecretRef` instead. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - suspend: - description: |- - Suspend tells the controller to suspend the reconciliation of this - HelmRepository. - type: boolean - timeout: - description: |- - Timeout is used for the index fetch operation for an HTTPS helm repository, - and for remote OCI Repository operations like pulling for an OCI helm - chart by the associated HelmChart. - Its default value is 60s. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$ - type: string - type: - description: |- - Type of the HelmRepository. - When this field is set to "oci", the URL field value must be prefixed with "oci://". - enum: - - default - - oci - type: string - url: - description: |- - URL of the Helm repository, a valid URL contains at least a protocol and - host. - pattern: ^(http|https|oci)://.*$ - type: string - required: - - url - type: object - status: - default: - observedGeneration: -1 - description: HelmRepositoryStatus records the observed state of the HelmRepository. - properties: - artifact: - description: Artifact represents the last successful HelmRepository reconciliation. - properties: - digest: - description: Digest is the digest of the file in the form of ':'. - pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ - type: string - lastUpdateTime: - description: |- - LastUpdateTime is the timestamp corresponding to the last update of the - Artifact. - format: date-time - type: string - metadata: - additionalProperties: - type: string - description: Metadata holds upstream information such as OCI annotations. - type: object - path: - description: |- - Path is the relative file path of the Artifact. It can be used to locate - the file in the root of the Artifact storage on the local file system of - the controller managing the Source. - type: string - revision: - description: |- - Revision is a human-readable identifier traceable in the origin source - system. It can be a Git commit SHA, Git tag, a Helm chart version, etc. - type: string - size: - description: Size is the number of bytes in the file. - format: int64 - type: integer - url: - description: |- - URL is the HTTP address of the Artifact as exposed by the controller - managing the Source. It can be used to retrieve the Artifact for - consumption, e.g. by another controller applying the Artifact contents. - type: string - required: - - digest - - lastUpdateTime - - path - - revision - - url - type: object - conditions: - description: Conditions holds the conditions for the HelmRepository. - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - observedGeneration: - description: |- - ObservedGeneration is the last observed generation of the HelmRepository - object. - format: int64 - type: integer - url: - description: |- - URL is the dynamic fetch link for the latest Artifact. - It is provided on a "best effort" basis, and using the precise - HelmRepositoryStatus.Artifact data is recommended. - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -6457,7 +3821,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: imagepolicies.image.toolkit.fluxcd.io spec: group: image.toolkit.fluxcd.io @@ -7033,7 +4397,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: imagerepositories.image.toolkit.fluxcd.io spec: group: image.toolkit.fluxcd.io @@ -7639,7 +5003,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: imageupdateautomations.image.toolkit.fluxcd.io spec: group: image.toolkit.fluxcd.io @@ -8448,7 +5812,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: kustomizations.kustomize.toolkit.fluxcd.io spec: group: kustomize.toolkit.fluxcd.io @@ -9129,637 +6493,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - deprecated: true - deprecationWarning: v1beta2 Kustomization is deprecated, upgrade to v1 - name: v1beta2 - schema: - openAPIV3Schema: - description: Kustomization is the Schema for the kustomizations API. - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: KustomizationSpec defines the configuration to calculate the desired state from a Source using Kustomize. - properties: - commonMetadata: - description: |- - CommonMetadata specifies the common labels and annotations that are applied to all resources. - Any existing label or annotation will be overridden if its key matches a common one. - properties: - annotations: - additionalProperties: - type: string - description: Annotations to be added to the object's metadata. - type: object - labels: - additionalProperties: - type: string - description: Labels to be added to the object's metadata. - type: object - type: object - components: - description: Components specifies relative paths to specifications of other Components. - items: - type: string - type: array - decryption: - description: Decrypt Kubernetes secrets before applying them on the cluster. - properties: - provider: - description: Provider is the name of the decryption engine. - enum: - - sops - type: string - secretRef: - description: The secret name containing the private OpenPGP keys used for decryption. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - required: - - provider - type: object - dependsOn: - description: |- - DependsOn may contain a meta.NamespacedObjectReference slice - with references to Kustomization resources that must be ready before this - Kustomization can be reconciled. - items: - description: |- - NamespacedObjectReference contains enough information to locate the referenced Kubernetes resource object in any - namespace. - properties: - name: - description: Name of the referent. - type: string - namespace: - description: Namespace of the referent, when not specified it acts as LocalObjectReference. - type: string - required: - - name - type: object - type: array - force: - default: false - description: |- - Force instructs the controller to recreate resources - when patching fails due to an immutable field change. - type: boolean - healthChecks: - description: A list of resources to be included in the health assessment. - items: - description: |- - NamespacedObjectKindReference contains enough information to locate the typed referenced Kubernetes resource object - in any namespace. - properties: - apiVersion: - description: API version of the referent, if not specified the Kubernetes preferred version will be used. - type: string - kind: - description: Kind of the referent. - type: string - name: - description: Name of the referent. - type: string - namespace: - description: Namespace of the referent, when not specified it acts as LocalObjectReference. - type: string - required: - - kind - - name - type: object - type: array - images: - description: |- - Images is a list of (image name, new name, new tag or digest) - for changing image names, tags or digests. This can also be achieved with a - patch, but this operator is simpler to specify. - items: - description: Image contains an image name, a new name, a new tag or digest, which will replace the original name and tag. - properties: - digest: - description: |- - Digest is the value used to replace the original image tag. - If digest is present NewTag value is ignored. - type: string - name: - description: Name is a tag-less image name. - type: string - newName: - description: NewName is the value used to replace the original name. - type: string - newTag: - description: NewTag is the value used to replace the original tag. - type: string - required: - - name - type: object - type: array - interval: - description: The interval at which to reconcile the Kustomization. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - kubeConfig: - description: |- - The KubeConfig for reconciling the Kustomization on a remote cluster. - When used in combination with KustomizationSpec.ServiceAccountName, - forces the controller to act on behalf of that Service Account at the - target cluster. - If the --default-service-account flag is set, its value will be used as - a controller level fallback for when KustomizationSpec.ServiceAccountName - is empty. - properties: - configMapRef: - description: |- - ConfigMapRef holds an optional name of a ConfigMap that contains - the following keys: - - - `provider`: the provider to use. One of `aws`, `azure`, `gcp`, or - `generic`. Required. - - `cluster`: the fully qualified resource name of the Kubernetes - cluster in the cloud provider API. Not used by the `generic` - provider. Required when one of `address` or `ca.crt` is not set. - - `address`: the address of the Kubernetes API server. Required - for `generic`. For the other providers, if not specified, the - first address in the cluster resource will be used, and if - specified, it must match one of the addresses in the cluster - resource. - If audiences is not set, will be used as the audience for the - `generic` provider. - - `ca.crt`: the optional PEM-encoded CA certificate for the - Kubernetes API server. If not set, the controller will use the - CA certificate from the cluster resource. - - `audiences`: the optional audiences as a list of - line-break-separated strings for the Kubernetes ServiceAccount - token. Defaults to the `address` for the `generic` provider, or - to specific values for the other providers depending on the - provider. - - `serviceAccountName`: the optional name of the Kubernetes - ServiceAccount in the same namespace that should be used - for authentication. If not specified, the controller - ServiceAccount will be used. - - Mutually exclusive with SecretRef. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - secretRef: - description: |- - SecretRef holds an optional name of a secret that contains a key with - the kubeconfig file as the value. If no key is set, the key will default - to 'value'. Mutually exclusive with ConfigMapRef. - It is recommended that the kubeconfig is self-contained, and the secret - is regularly updated if credentials such as a cloud-access-token expire. - Cloud specific `cmd-path` auth helpers will not function without adding - binaries and credentials to the Pod that is responsible for reconciling - Kubernetes resources. Supported only for the generic provider. - properties: - key: - description: Key in the Secret, when not specified an implementation-specific default key is used. - type: string - name: - description: Name of the Secret. - type: string - required: - - name - type: object - type: object - x-kubernetes-validations: - - message: exactly one of spec.kubeConfig.configMapRef or spec.kubeConfig.secretRef must be specified - rule: has(self.configMapRef) || has(self.secretRef) - - message: exactly one of spec.kubeConfig.configMapRef or spec.kubeConfig.secretRef must be specified - rule: '!has(self.configMapRef) || !has(self.secretRef)' - patches: - description: |- - Strategic merge and JSON patches, defined as inline YAML objects, - capable of targeting objects based on kind, label and annotation selectors. - items: - description: |- - Patch contains an inline StrategicMerge or JSON6902 patch, and the target the patch should - be applied to. - properties: - patch: - description: |- - Patch contains an inline StrategicMerge patch or an inline JSON6902 patch with - an array of operation objects. - type: string - target: - description: Target points to the resources that the patch document should be applied to. - properties: - annotationSelector: - description: |- - AnnotationSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource annotations. - type: string - group: - description: |- - Group is the API group to select resources from. - Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - kind: - description: |- - Kind of the API Group to select resources from. - Together with Group and Version it is capable of unambiguously - identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - labelSelector: - description: |- - LabelSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource labels. - type: string - name: - description: Name to match resources with. - type: string - namespace: - description: Namespace to select resources from. - type: string - version: - description: |- - Version of the API Group to select resources from. - Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - type: object - required: - - patch - type: object - type: array - patchesJson6902: - description: |- - JSON 6902 patches, defined as inline YAML objects. - Deprecated: Use Patches instead. - items: - description: JSON6902Patch contains a JSON6902 patch and the target the patch should be applied to. - properties: - patch: - description: Patch contains the JSON6902 patch document with an array of operation objects. - items: - description: |- - JSON6902 is a JSON6902 operation object. - https://datatracker.ietf.org/doc/html/rfc6902#section-4 - properties: - from: - description: |- - From contains a JSON-pointer value that references a location within the target document where the operation is - performed. The meaning of the value depends on the value of Op, and is NOT taken into account by all operations. - type: string - op: - description: |- - Op indicates the operation to perform. Its value MUST be one of "add", "remove", "replace", "move", "copy", or - "test". - https://datatracker.ietf.org/doc/html/rfc6902#section-4 - enum: - - test - - remove - - add - - replace - - move - - copy - type: string - path: - description: |- - Path contains the JSON-pointer value that references a location within the target document where the operation - is performed. The meaning of the value depends on the value of Op. - type: string - value: - description: |- - Value contains a valid JSON structure. The meaning of the value depends on the value of Op, and is NOT taken into - account by all operations. - x-kubernetes-preserve-unknown-fields: true - required: - - op - - path - type: object - type: array - target: - description: Target points to the resources that the patch document should be applied to. - properties: - annotationSelector: - description: |- - AnnotationSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource annotations. - type: string - group: - description: |- - Group is the API group to select resources from. - Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - kind: - description: |- - Kind of the API Group to select resources from. - Together with Group and Version it is capable of unambiguously - identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - labelSelector: - description: |- - LabelSelector is a string that follows the label selection expression - https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api - It matches with the resource labels. - type: string - name: - description: Name to match resources with. - type: string - namespace: - description: Namespace to select resources from. - type: string - version: - description: |- - Version of the API Group to select resources from. - Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources. - https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md - type: string - type: object - required: - - patch - - target - type: object - type: array - patchesStrategicMerge: - description: |- - Strategic merge patches, defined as inline YAML objects. - Deprecated: Use Patches instead. - items: - x-kubernetes-preserve-unknown-fields: true - type: array - path: - description: |- - Path to the directory containing the kustomization.yaml file, or the - set of plain YAMLs a kustomization.yaml should be generated for. - Defaults to 'None', which translates to the root path of the SourceRef. - type: string - postBuild: - description: |- - PostBuild describes which actions to perform on the YAML manifest - generated by building the kustomize overlay. - properties: - substitute: - additionalProperties: - type: string - description: |- - Substitute holds a map of key/value pairs. - The variables defined in your YAML manifests - that match any of the keys defined in the map - will be substituted with the set value. - Includes support for bash string replacement functions - e.g. ${var:=default}, ${var:position} and ${var/substring/replacement}. - type: object - substituteFrom: - description: |- - SubstituteFrom holds references to ConfigMaps and Secrets containing - the variables and their values to be substituted in the YAML manifests. - The ConfigMap and the Secret data keys represent the var names and they - must match the vars declared in the manifests for the substitution to happen. - items: - description: |- - SubstituteReference contains a reference to a resource containing - the variables name and value. - properties: - kind: - description: Kind of the values referent, valid values are ('Secret', 'ConfigMap'). - enum: - - Secret - - ConfigMap - type: string - name: - description: |- - Name of the values referent. Should reside in the same namespace as the - referring resource. - maxLength: 253 - minLength: 1 - type: string - optional: - default: false - description: |- - Optional indicates whether the referenced resource must exist, or whether to - tolerate its absence. If true and the referenced resource is absent, proceed - as if the resource was present but empty, without any variables defined. - type: boolean - required: - - kind - - name - type: object - type: array - type: object - prune: - description: Prune enables garbage collection. - type: boolean - retryInterval: - description: |- - The interval at which to retry a previously failed reconciliation. - When not specified, the controller uses the KustomizationSpec.Interval - value to retry failures. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - serviceAccountName: - description: |- - The name of the Kubernetes service account to impersonate - when reconciling this Kustomization. - type: string - sourceRef: - description: Reference of the source where the kustomization file is. - properties: - apiVersion: - description: API version of the referent. - type: string - kind: - description: Kind of the referent. - enum: - - OCIRepository - - GitRepository - - Bucket - type: string - name: - description: Name of the referent. - type: string - namespace: - description: Namespace of the referent, defaults to the namespace of the Kubernetes resource object that contains the reference. - type: string - required: - - kind - - name - type: object - suspend: - description: |- - This flag tells the controller to suspend subsequent kustomize executions, - it does not apply to already started executions. Defaults to false. - type: boolean - targetNamespace: - description: |- - TargetNamespace sets or overrides the namespace in the - kustomization.yaml file. - maxLength: 63 - minLength: 1 - type: string - timeout: - description: |- - Timeout for validation, apply and health checking operations. - Defaults to 'Interval' duration. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - validation: - description: 'Deprecated: Not used in v1beta2.' - enum: - - none - - client - - server - type: string - wait: - description: |- - Wait instructs the controller to check the health of all the reconciled resources. - When enabled, the HealthChecks are ignored. Defaults to false. - type: boolean - required: - - interval - - prune - - sourceRef - type: object - status: - default: - observedGeneration: -1 - description: KustomizationStatus defines the observed state of a kustomization. - properties: - conditions: - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - inventory: - description: Inventory contains the list of Kubernetes resource object references that have been successfully applied. - properties: - entries: - description: Entries of Kubernetes resource object references. - items: - description: ResourceRef contains the information necessary to locate a resource within a cluster. - properties: - id: - description: |- - ID is the string representation of the Kubernetes resource object's metadata, - in the format '___'. - type: string - v: - description: Version is the API version of the Kubernetes resource object's kind. - type: string - required: - - id - - v - type: object - type: array - required: - - entries - type: object - lastAppliedRevision: - description: |- - The last successfully applied revision. - Equals the Revision of the applied Artifact from the referenced Source. - type: string - lastAttemptedRevision: - description: LastAttemptedRevision is the revision of the last reconciliation attempt. - type: string - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - observedGeneration: - description: ObservedGeneration is the last reconciled generation. - format: int64 - type: integer - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -9770,7 +6503,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: ocirepositories.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -10168,410 +6901,6 @@ spec: storage: true subresources: status: {} - - additionalPrinterColumns: - - jsonPath: .spec.url - name: URL - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].status - name: Ready - type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - deprecated: true - deprecationWarning: v1beta2 OCIRepository is deprecated, upgrade to v1 - name: v1beta2 - schema: - openAPIV3Schema: - description: OCIRepository is the Schema for the ocirepositories API - properties: - apiVersion: - description: |- - APIVersion defines the versioned schema of this representation of an object. - Servers should convert recognized schemas to the latest internal value, and - may reject unrecognized values. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources - type: string - kind: - description: |- - Kind is a string value representing the REST resource this object represents. - Servers may infer this from the endpoint the client submits requests to. - Cannot be updated. - In CamelCase. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds - type: string - metadata: - type: object - spec: - description: OCIRepositorySpec defines the desired state of OCIRepository - properties: - certSecretRef: - description: |- - CertSecretRef can be given the name of a Secret containing - either or both of - - - a PEM-encoded client certificate (`tls.crt`) and private - key (`tls.key`); - - a PEM-encoded CA certificate (`ca.crt`) - - and whichever are supplied, will be used for connecting to the - registry. The client cert and key are useful if you are - authenticating with a certificate; the CA cert is useful if - you are using a self-signed server certificate. The Secret must - be of type `Opaque` or `kubernetes.io/tls`. - - Note: Support for the `caFile`, `certFile` and `keyFile` keys have - been deprecated. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - ignore: - description: |- - Ignore overrides the set of excluded patterns in the .sourceignore format - (which is the same as .gitignore). If not provided, a default will be used, - consult the documentation for your version to find out what those are. - type: string - insecure: - description: Insecure allows connecting to a non-TLS HTTP container registry. - type: boolean - interval: - description: |- - Interval at which the OCIRepository URL is checked for updates. - This interval is approximate and may be subject to jitter to ensure - efficient use of resources. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ - type: string - layerSelector: - description: |- - LayerSelector specifies which layer should be extracted from the OCI artifact. - When not specified, the first layer found in the artifact is selected. - properties: - mediaType: - description: |- - MediaType specifies the OCI media type of the layer - which should be extracted from the OCI Artifact. The - first layer matching this type is selected. - type: string - operation: - description: |- - Operation specifies how the selected layer should be processed. - By default, the layer compressed content is extracted to storage. - When the operation is set to 'copy', the layer compressed content - is persisted to storage as it is. - enum: - - extract - - copy - type: string - type: object - provider: - default: generic - description: |- - The provider used for authentication, can be 'aws', 'azure', 'gcp' or 'generic'. - When not specified, defaults to 'generic'. - enum: - - generic - - aws - - azure - - gcp - type: string - proxySecretRef: - description: |- - ProxySecretRef specifies the Secret containing the proxy configuration - to use while communicating with the container registry. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - ref: - description: |- - The OCI reference to pull and monitor for changes, - defaults to the latest tag. - properties: - digest: - description: |- - Digest is the image digest to pull, takes precedence over SemVer. - The value should be in the format 'sha256:'. - type: string - semver: - description: |- - SemVer is the range of tags to pull selecting the latest within - the range, takes precedence over Tag. - type: string - semverFilter: - description: SemverFilter is a regex pattern to filter the tags within the SemVer range. - type: string - tag: - description: Tag is the image tag to pull, defaults to latest. - type: string - type: object - secretRef: - description: |- - SecretRef contains the secret name containing the registry login - credentials to resolve image metadata. - The secret must be of type kubernetes.io/dockerconfigjson. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - serviceAccountName: - description: |- - ServiceAccountName is the name of the Kubernetes ServiceAccount used to authenticate - the image pull if the service account has attached pull secrets. For more information: - https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account - type: string - suspend: - description: This flag tells the controller to suspend the reconciliation of this source. - type: boolean - timeout: - default: 60s - description: The timeout for remote OCI Repository operations like pulling, defaults to 60s. - pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$ - type: string - url: - description: |- - URL is a reference to an OCI artifact repository hosted - on a remote container registry. - pattern: ^oci://.*$ - type: string - verify: - description: |- - Verify contains the secret name containing the trusted public keys - used to verify the signature and specifies which provider to use to check - whether OCI image is authentic. - properties: - matchOIDCIdentity: - description: |- - MatchOIDCIdentity specifies the identity matching criteria to use - while verifying an OCI artifact which was signed using Cosign keyless - signing. The artifact's identity is deemed to be verified if any of the - specified matchers match against the identity. - items: - description: |- - OIDCIdentityMatch specifies options for verifying the certificate identity, - i.e. the issuer and the subject of the certificate. - properties: - issuer: - description: |- - Issuer specifies the regex pattern to match against to verify - the OIDC issuer in the Fulcio certificate. The pattern must be a - valid Go regular expression. - type: string - subject: - description: |- - Subject specifies the regex pattern to match against to verify - the identity subject in the Fulcio certificate. The pattern must - be a valid Go regular expression. - type: string - required: - - issuer - - subject - type: object - type: array - provider: - default: cosign - description: Provider specifies the technology used to sign the OCI Artifact. - enum: - - cosign - - notation - type: string - secretRef: - description: |- - SecretRef specifies the Kubernetes Secret containing the - trusted public keys. - properties: - name: - description: Name of the referent. - type: string - required: - - name - type: object - required: - - provider - type: object - required: - - interval - - url - type: object - status: - default: - observedGeneration: -1 - description: OCIRepositoryStatus defines the observed state of OCIRepository - properties: - artifact: - description: Artifact represents the output of the last successful OCI Repository sync. - properties: - digest: - description: Digest is the digest of the file in the form of ':'. - pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$ - type: string - lastUpdateTime: - description: |- - LastUpdateTime is the timestamp corresponding to the last update of the - Artifact. - format: date-time - type: string - metadata: - additionalProperties: - type: string - description: Metadata holds upstream information such as OCI annotations. - type: object - path: - description: |- - Path is the relative file path of the Artifact. It can be used to locate - the file in the root of the Artifact storage on the local file system of - the controller managing the Source. - type: string - revision: - description: |- - Revision is a human-readable identifier traceable in the origin source - system. It can be a Git commit SHA, Git tag, a Helm chart version, etc. - type: string - size: - description: Size is the number of bytes in the file. - format: int64 - type: integer - url: - description: |- - URL is the HTTP address of the Artifact as exposed by the controller - managing the Source. It can be used to retrieve the Artifact for - consumption, e.g. by another controller applying the Artifact contents. - type: string - required: - - digest - - lastUpdateTime - - path - - revision - - url - type: object - conditions: - description: Conditions holds the conditions for the OCIRepository. - items: - description: Condition contains details for one aspect of the current state of this API Resource. - properties: - lastTransitionTime: - description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. - This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: |- - message is a human readable message indicating details about the transition. - This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: |- - observedGeneration represents the .metadata.generation that the condition was set based upon. - For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date - with respect to the current state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: |- - reason contains a programmatic identifier indicating the reason for the condition's last transition. - Producers of specific condition types may define expected values and meanings for this field, - and whether the values are considered a guaranteed API. - The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - contentConfigChecksum: - description: |- - ContentConfigChecksum is a checksum of all the configurations related to - the content of the source artifact: - - .spec.ignore - - .spec.layerSelector - observed in .status.observedGeneration version of the object. This can - be used to determine if the content configuration has changed and the - artifact needs to be rebuilt. - It has the format of `:`, for example: `sha256:`. - - Deprecated: Replaced with explicit fields for observed artifact content - config in the status. - type: string - lastHandledReconcileAt: - description: |- - LastHandledReconcileAt holds the value of the most recent - reconcile request value, so a change of the annotation value - can be detected. - type: string - observedGeneration: - description: ObservedGeneration is the last observed generation. - format: int64 - type: integer - observedIgnore: - description: |- - ObservedIgnore is the observed exclusion patterns used for constructing - the source artifact. - type: string - observedLayerSelector: - description: |- - ObservedLayerSelector is the observed layer selector used for constructing - the source artifact. - properties: - mediaType: - description: |- - MediaType specifies the OCI media type of the layer - which should be extracted from the OCI Artifact. The - first layer matching this type is selected. - type: string - operation: - description: |- - Operation specifies how the selected layer should be processed. - By default, the layer compressed content is extracted to storage. - When the operation is set to 'copy', the layer compressed content - is persisted to storage as it is. - enum: - - extract - - copy - type: string - type: object - url: - description: URL is the download link for the artifact output of the last OCI Repository sync. - type: string - type: object - type: object - served: true - storage: false - subresources: - status: {} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -10582,7 +6911,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: providers.notification.toolkit.fluxcd.io spec: group: notification.toolkit.fluxcd.io @@ -10942,6 +7271,7 @@ spec: - github - gitlab - gitea + - giteapullrequestcomment - bitbucketserver - bitbucket - azuredevops @@ -10957,6 +7287,8 @@ spec: - alertmanager - grafana - githubdispatch + - githubpullrequestcomment + - gitlabmergerequestcomment - pagerduty - datadog - nats @@ -10987,7 +7319,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: receivers.notification.toolkit.fluxcd.io spec: group: notification.toolkit.fluxcd.io @@ -11078,6 +7410,8 @@ spec: - ImagePolicy - ImageUpdateAutomation - OCIRepository + - ArtifactGenerator + - ExternalArtifact type: string matchLabels: additionalProperties: @@ -11297,6 +7631,8 @@ spec: - ImagePolicy - ImageUpdateAutomation - OCIRepository + - ArtifactGenerator + - ExternalArtifact type: string matchLabels: additionalProperties: @@ -11459,44 +7795,10 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 pod-security.kubernetes.io/enforce: privileged name: cozy-fluxcd --- -apiVersion: v1 -kind: ResourceQuota -metadata: - annotations: - app.kubernetes.io/role: cluster-admin - labels: - app.kubernetes.io/name: flux - app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 - name: flux - namespace: cozy-fluxcd -spec: - hard: - pods: "1000" - scopeSelector: - matchExpressions: - - operator: In - scopeName: PriorityClass - values: - - system-node-critical - - system-cluster-critical ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - annotations: - app.kubernetes.io/role: cluster-admin - labels: - app.kubernetes.io/name: flux - app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 - name: flux - namespace: cozy-fluxcd ---- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -11505,7 +7807,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" rbac.authorization.k8s.io/aggregate-to-view: "true" @@ -11533,7 +7835,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: flux roleRef: apiGroup: rbac.authorization.k8s.io @@ -11544,6 +7846,40 @@ subjects: name: flux namespace: cozy-fluxcd --- +apiVersion: v1 +kind: ResourceQuota +metadata: + annotations: + app.kubernetes.io/role: cluster-admin + labels: + app.kubernetes.io/name: flux + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v2.8.0 + name: flux + namespace: cozy-fluxcd +spec: + hard: + pods: "1000" + scopeSelector: + matchExpressions: + - operator: In + scopeName: PriorityClass + values: + - system-node-critical + - system-cluster-critical +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + app.kubernetes.io/role: cluster-admin + labels: + app.kubernetes.io/name: flux + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v2.8.0 + name: flux + namespace: cozy-fluxcd +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -11552,7 +7888,7 @@ metadata: labels: app.kubernetes.io/name: flux app.kubernetes.io/part-of: flux - app.kubernetes.io/version: v2.7.3 + app.kubernetes.io/version: v2.8.0 name: flux namespace: cozy-fluxcd spec: @@ -11623,7 +7959,7 @@ spec: value: /tmp/.sigstore - name: NO_PROXY value: .svc - image: ghcr.io/fluxcd/source-controller:v1.7.3 + image: ghcr.io/fluxcd/source-controller:v1.8.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -11693,7 +8029,7 @@ spec: value: /tmp/.sigstore - name: NO_PROXY value: .svc - image: ghcr.io/fluxcd/kustomize-controller:v1.7.2 + image: ghcr.io/fluxcd/kustomize-controller:v1.8.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -11758,7 +8094,7 @@ spec: value: /tmp/.sigstore - name: NO_PROXY value: .svc - image: ghcr.io/fluxcd/helm-controller:v1.4.3 + image: ghcr.io/fluxcd/helm-controller:v1.5.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -11820,7 +8156,7 @@ spec: value: /tmp/.sigstore - name: NO_PROXY value: .svc - image: ghcr.io/fluxcd/notification-controller:v1.7.4 + image: ghcr.io/fluxcd/notification-controller:v1.8.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -11890,7 +8226,7 @@ spec: value: /tmp/.sigstore - name: NO_PROXY value: .svc - image: ghcr.io/fluxcd/source-watcher:v2.0.2 + image: ghcr.io/fluxcd/source-watcher:v2.1.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/packages/apps/bucket/templates/helmrelease.yaml b/packages/apps/bucket/templates/helmrelease.yaml index d32905128..acaf8cc0b 100644 --- a/packages/apps/bucket/templates/helmrelease.yaml +++ b/packages/apps/bucket/templates/helmrelease.yaml @@ -15,7 +15,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/foundationdb/README.md b/packages/apps/foundationdb/README.md index df971d299..c253bc67e 100644 --- a/packages/apps/foundationdb/README.md +++ b/packages/apps/foundationdb/README.md @@ -81,8 +81,8 @@ when it sees a chart-rendered Running backup against the same target. customParameters: - "knob_disable_posix_kernel_aio=1" -# Image type (unified is default and recommended for new deployments) -imageType: "unified" +# Image type (split is the default; matches existing clusters' effective value) +imageType: "split" # Enable automatic pod replacements automaticReplacements: true @@ -191,12 +191,12 @@ For Cozystack-specific issues, consult the Cozystack documentation or support ch ### FoundationDB configuration -| Name | Description | Type | Value | -| ---------------------------- | ------------------------------------------ | ---------- | --------- | -| `customParameters` | Custom parameters to pass to FoundationDB. | `[]string` | `[]` | -| `imageType` | Container image deployment type. | `string` | `unified` | -| `securityContext` | Security context for containers. | `object` | `{}` | -| `securityContext.runAsUser` | User ID to run the container. | `int` | `4059` | -| `securityContext.runAsGroup` | Group ID to run the container. | `int` | `4059` | -| `automaticReplacements` | Enable automatic pod replacements. | `bool` | `true` | +| Name | Description | Type | Value | +| ---------------------------- | ------------------------------------------ | ---------- | ------- | +| `customParameters` | Custom parameters to pass to FoundationDB. | `[]string` | `[]` | +| `imageType` | Container image deployment type. | `string` | `split` | +| `securityContext` | Security context for containers. | `object` | `{}` | +| `securityContext.runAsUser` | User ID to run the container. | `int` | `4059` | +| `securityContext.runAsGroup` | Group ID to run the container. | `int` | `4059` | +| `automaticReplacements` | Enable automatic pod replacements. | `bool` | `true` | diff --git a/packages/apps/foundationdb/templates/cluster.yaml b/packages/apps/foundationdb/templates/cluster.yaml index be804233e..af9ff822f 100644 --- a/packages/apps/foundationdb/templates/cluster.yaml +++ b/packages/apps/foundationdb/templates/cluster.yaml @@ -21,21 +21,33 @@ spec: automationOptions: replacements: enabled: {{ .Values.automaticReplacements }} - faultDomain: - key: {{ .Values.cluster.faultDomain.key }} - {{- if .Values.cluster.faultDomain.valueFrom }} - valueFrom: {{ .Values.cluster.faultDomain.valueFrom }} - {{- end }} - imageType: {{ .Values.imageType }} - labels: - filterOnOwnerReference: false - matchLabels: - foundationdb.org/fdb-cluster-name: {{ .Release.Name }} - processClassLabels: - - foundationdb.org/fdb-process-class - processGroupIDLabels: - - foundationdb.org/fdb-process-group-id - minimumUptimeSecondsForBounce: 60 + + # The FoundationDBCluster CRD schema places faultDomain, imageType, labels, + # and minimumUptimeSecondsForBounce as direct children of spec (siblings of + # automationOptions). The chart historically nested them under + # automationOptions; Flux v2.7's client-side patch silently dropped the + # unknown fields, so the misconfiguration had no runtime effect. Flux v2.8's + # Server-Side Apply enforces the CRD schema and rejects the apply with + # "field not declared in schema". Move all four fields to where the + # operator actually reads them. + faultDomain: + key: {{ .Values.cluster.faultDomain.key }} + {{- if .Values.cluster.faultDomain.valueFrom }} + valueFrom: {{ .Values.cluster.faultDomain.valueFrom }} + {{- end }} + + imageType: {{ .Values.imageType }} + + labels: + filterOnOwnerReference: false + matchLabels: + foundationdb.org/fdb-cluster-name: {{ .Release.Name }} + processClassLabels: + - foundationdb.org/fdb-process-class + processGroupIDLabels: + - foundationdb.org/fdb-process-group-id + + minimumUptimeSecondsForBounce: 60 processes: general: diff --git a/packages/apps/foundationdb/values.schema.json b/packages/apps/foundationdb/values.schema.json index 0df77b498..35c60fa35 100644 --- a/packages/apps/foundationdb/values.schema.json +++ b/packages/apps/foundationdb/values.schema.json @@ -299,7 +299,7 @@ "imageType": { "description": "Container image deployment type.", "type": "string", - "default": "unified", + "default": "split", "enum": [ "unified", "split" diff --git a/packages/apps/foundationdb/values.yaml b/packages/apps/foundationdb/values.yaml index 3c0626302..a1c62a948 100644 --- a/packages/apps/foundationdb/values.yaml +++ b/packages/apps/foundationdb/values.yaml @@ -147,8 +147,13 @@ customParameters: [] ## @value unified ## @value split -## @param {ImageType} imageType="unified" - Container image deployment type. -imageType: "unified" +## @param {ImageType} imageType="split" - Container image deployment type. +# Defaults to "split" to match the operator default that existing clusters +# already run: before the Flux v2.8 SSA fix this value was nested under +# automationOptions and silently dropped, so the operator never saw "unified". +# Setting it to "split" keeps upgrades non-disruptive; switch to "unified" +# deliberately to migrate (triggers an in-place image-type change). +imageType: "split" ## @typedef {struct} SecurityContext - Security context for containers. ## @field {int} runAsUser - User ID to run the container. diff --git a/packages/apps/harbor/templates/harbor.yaml b/packages/apps/harbor/templates/harbor.yaml index d59c1c1b2..72bfa61a4 100644 --- a/packages/apps/harbor/templates/harbor.yaml +++ b/packages/apps/harbor/templates/harbor.yaml @@ -53,7 +53,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/kafka/Makefile b/packages/apps/kafka/Makefile index 741d018b3..ef71391b3 100644 --- a/packages/apps/kafka/Makefile +++ b/packages/apps/kafka/Makefile @@ -1,6 +1,9 @@ include ../../../hack/package.mk PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] +test: + helm unittest . + generate: cozyvalues-gen -m 'kafka' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/kafka/types.go ../../../hack/update-crd.sh diff --git a/packages/apps/kafka/templates/kafka.yaml b/packages/apps/kafka/templates/kafka.yaml index c17738b31..49876bacf 100644 --- a/packages/apps/kafka/templates/kafka.yaml +++ b/packages/apps/kafka/templates/kafka.yaml @@ -100,9 +100,13 @@ spec: topicOperator: {} userOperator: {} template: + # `pod` accepts metadata + a flat set of pod-spec fields + # (enableServiceLinks, securityContext, affinity, …) directly. + # The previous file nested enableServiceLinks under a phantom + # `template.spec` key — Flux v2.7 dropped it silently, v2.8 SSA + # rejects it with "field not declared in schema". pod: metadata: - labels: - policy.cozystack.io/allow-to-apiserver: "true" - spec: + labels: + policy.cozystack.io/allow-to-apiserver: "true" enableServiceLinks: false diff --git a/packages/apps/kafka/templates/workloadmonitor.yaml b/packages/apps/kafka/templates/workloadmonitor.yaml index c31eb4254..ba58333ed 100644 --- a/packages/apps/kafka/templates/workloadmonitor.yaml +++ b/packages/apps/kafka/templates/workloadmonitor.yaml @@ -6,7 +6,7 @@ metadata: labels: workloads.cozystack.io/resource-preset: {{ .Values.kafka.resourcesPreset | quote }} spec: - replicas: {{ .Values.replicas }} + replicas: {{ .Values.kafka.replicas }} minReplicas: 1 kind: kafka type: kafka @@ -24,7 +24,7 @@ metadata: labels: workloads.cozystack.io/resource-preset: {{ .Values.zookeeper.resourcesPreset | quote }} spec: - replicas: {{ .Values.replicas }} + replicas: {{ .Values.zookeeper.replicas }} minReplicas: 1 kind: kafka type: zookeeper diff --git a/packages/apps/kafka/tests/entityoperator_template_test.yaml b/packages/apps/kafka/tests/entityoperator_template_test.yaml new file mode 100644 index 000000000..95b792138 --- /dev/null +++ b/packages/apps/kafka/tests/entityoperator_template_test.yaml @@ -0,0 +1,22 @@ +suite: Kafka entityOperator pod template + +# Regression cover for the strict-SSA fix that moved enableServiceLinks out of +# a phantom `entityOperator.template.spec` key (silently dropped by Flux v2.7, +# rejected by v2.8 SSA as "field not declared in schema") into the flat +# `entityOperator.template.pod` set where the Strimzi CRD actually reads it. + +templates: + - templates/kafka.yaml + +tests: + - it: enableServiceLinks lives under entityOperator.template.pod + release: + name: test-kafka + namespace: tenant-test + asserts: + - equal: + path: spec.entityOperator.template.pod.enableServiceLinks + value: false + # the phantom template.spec key must not reappear + - notExists: + path: spec.entityOperator.template.spec diff --git a/packages/apps/kafka/tests/workloadmonitor_test.yaml b/packages/apps/kafka/tests/workloadmonitor_test.yaml new file mode 100644 index 000000000..b4a268da0 --- /dev/null +++ b/packages/apps/kafka/tests/workloadmonitor_test.yaml @@ -0,0 +1,70 @@ +suite: Kafka WorkloadMonitor replica paths + +# Regression cover for the fix that split the WorkloadMonitor replica +# source from a single phantom `.Values.replicas` (which does not exist in +# this chart's values — kafka and zookeeper carry their own counts) into the +# correct `.Values.kafka.replicas` and `.Values.zookeeper.replicas`. Before +# the fix both monitors rendered `replicas:` empty, so the workload-monitor +# controller never knew the expected replica count. + +templates: + - templates/workloadmonitor.yaml + +tests: + - it: kafka and zookeeper monitors read their own replica counts + release: + name: test-kafka + namespace: tenant-test + set: + kafka: + replicas: 5 + zookeeper: + replicas: 2 + asserts: + - hasDocuments: + count: 2 + # doc 0 — kafka monitor + - documentIndex: 0 + equal: + path: metadata.name + value: test-kafka + - documentIndex: 0 + equal: + path: spec.type + value: kafka + - documentIndex: 0 + equal: + path: spec.replicas + value: 5 + # doc 1 — zookeeper monitor + - documentIndex: 1 + equal: + path: metadata.name + value: test-kafka-zookeeper + - documentIndex: 1 + equal: + path: spec.type + value: zookeeper + - documentIndex: 1 + equal: + path: spec.replicas + value: 2 + + - it: replica counts stay independent (kafka != zookeeper) + release: + name: test-kafka + namespace: tenant-test + set: + kafka: + replicas: 7 + zookeeper: + replicas: 3 + asserts: + - documentIndex: 0 + equal: + path: spec.replicas + value: 7 + - documentIndex: 1 + equal: + path: spec.replicas + value: 3 diff --git a/packages/apps/kubernetes/README.md b/packages/apps/kubernetes/README.md index d6560d6a8..1912419f0 100644 --- a/packages/apps/kubernetes/README.md +++ b/packages/apps/kubernetes/README.md @@ -221,56 +221,77 @@ See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-pr 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 | +| Name | vCPUs | Memory | +|------------------|-------|--------| +| `cx1.2xlarge` | 8 | 16Gi | +| `cx1.2xlarge1gi` | 8 | 16Gi | +| `cx1.4xlarge` | 16 | 32Gi | +| `cx1.4xlarge1gi` | 16 | 32Gi | +| `cx1.8xlarge` | 32 | 64Gi | +| `cx1.8xlarge1gi` | 32 | 64Gi | +| `cx1.large` | 2 | 4Gi | +| `cx1.large1gi` | 2 | 4Gi | +| `cx1.medium` | 1 | 2Gi | +| `cx1.medium1gi` | 1 | 2Gi | +| `cx1.xlarge` | 4 | 8Gi | +| `cx1.xlarge1gi` | 4 | 8Gi | +| `d1.2xlarge` | 8 | 32Gi | +| `d1.2xmedium` | 2 | 4Gi | +| `d1.4xlarge` | 16 | 64Gi | +| `d1.8xlarge` | 32 | 128Gi | +| `d1.large` | 2 | 8Gi | +| `d1.medium` | 1 | 4Gi | +| `d1.micro` | 1 | 1Gi | +| `d1.nano` | 1 | 512Mi | +| `d1.small` | 1 | 2Gi | +| `d1.xlarge` | 4 | 16Gi | +| `gn1.2xlarge` | 8 | 32Gi | +| `gn1.4xlarge` | 16 | 64Gi | +| `gn1.8xlarge` | 32 | 128Gi | +| `gn1.xlarge` | 4 | 16Gi | +| `m1.2xlarge` | 8 | 64Gi | +| `m1.2xlarge1gi` | 8 | 64Gi | +| `m1.4xlarge` | 16 | 128Gi | +| `m1.4xlarge1gi` | 16 | 128Gi | +| `m1.8xlarge` | 32 | 256Gi | +| `m1.8xlarge1gi` | 32 | 256Gi | +| `m1.large` | 2 | 16Gi | +| `m1.large1gi` | 2 | 16Gi | +| `m1.xlarge` | 4 | 32Gi | +| `m1.xlarge1gi` | 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 | ### Kubelet Resource Reservations diff --git a/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml b/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml index fd9dac7eb..b27067be8 100644 --- a/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml @@ -26,7 +26,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 {{- if .Values.addons.certManager.valuesOverride }} @@ -36,11 +35,6 @@ spec: valuesKey: values {{- end }} - dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} {{- if .Values.addons.certManager.valuesOverride }} --- apiVersion: v1 diff --git a/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml b/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml index 700b666e3..256a59220 100644 --- a/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml @@ -36,16 +36,11 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: {{- toYaml (deepCopy .Values.addons.certManager.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCertManagerValues" .))) | nindent 4 }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-cert-manager-crds diff --git a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml index d8c90cbf4..5b69e2f29 100644 --- a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml @@ -42,17 +42,12 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: {{- toYaml (deepCopy .Values.addons.cilium.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCiliumValues" .))) | nindent 4 }} - dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} {{- if $.Values.addons.gatewayAPI.enabled }} + dependsOn: - name: {{ .Release.Name }}-gateway-api-crds namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/coredns.yaml b/packages/apps/kubernetes/templates/helmreleases/coredns.yaml index 0711a51df..0ade90341 100644 --- a/packages/apps/kubernetes/templates/helmreleases/coredns.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/coredns.yaml @@ -31,16 +31,11 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: {{- toYaml (deepCopy .Values.addons.coredns.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCoreDNSValues" .))) | nindent 4 }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/csi.yaml b/packages/apps/kubernetes/templates/helmreleases/csi.yaml index 109d78e13..e9f973054 100644 --- a/packages/apps/kubernetes/templates/helmreleases/csi.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/csi.yaml @@ -36,8 +36,4 @@ spec: namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml b/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml index 25fff01cf..7ac75d3b5 100644 --- a/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml @@ -26,7 +26,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: @@ -35,10 +34,6 @@ spec: tolerations: [] hostNetwork: false dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} --- @@ -74,10 +69,6 @@ spec: {{- toYaml . | nindent 4 }} {{- end }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-fluxcd-operator diff --git a/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml b/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml index b4172ed1a..65d52b1ca 100644 --- a/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml @@ -25,12 +25,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 - dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml index 655dc868b..ef2a1c64a 100644 --- a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml @@ -34,7 +34,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 {{- $defaults := fromYaml (include "cozystack.defaultGpuOperatorValues" .) }} @@ -46,10 +45,6 @@ spec: {{- end }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/hami.yaml b/packages/apps/kubernetes/templates/helmreleases/hami.yaml index f1538c7c2..635f061f8 100644 --- a/packages/apps/kubernetes/templates/helmreleases/hami.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/hami.yaml @@ -29,7 +29,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 {{- with .Values.addons.hami.valuesOverride }} @@ -38,10 +37,6 @@ spec: {{- end }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-gpu-operator diff --git a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml index 6e2183d30..e87ab79b0 100644 --- a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml @@ -48,16 +48,11 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: {{- toYaml (deepCopy .Values.addons.ingressNginx.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultIngressValues" .))) | nindent 4 }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/metrics-server.yaml b/packages/apps/kubernetes/templates/helmreleases/metrics-server.yaml index 3e6f96601..50e7d695d 100644 --- a/packages/apps/kubernetes/templates/helmreleases/metrics-server.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/metrics-server.yaml @@ -29,10 +29,6 @@ spec: remediation: retries: -1 dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-prometheus-operator-crds diff --git a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml index a811f7ddd..2ec0bc3ca 100644 --- a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml @@ -28,14 +28,9 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cozy-victoria-metrics-operator namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-vertical-pod-autoscaler-crds diff --git a/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml b/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml index c61fea7ca..09c20aa05 100644 --- a/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml @@ -138,7 +138,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: @@ -160,10 +159,6 @@ spec: documented on the OuroborosAddon field. */ -}} {{- toYaml (deepCopy .Values.addons.ouroboros.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultOuroborosValues" .))) | nindent 4 }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-coredns diff --git a/packages/apps/kubernetes/templates/helmreleases/prometheus-operator-crds.yaml b/packages/apps/kubernetes/templates/helmreleases/prometheus-operator-crds.yaml index 3038a058e..3bb0afc7c 100644 --- a/packages/apps/kubernetes/templates/helmreleases/prometheus-operator-crds.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/prometheus-operator-crds.yaml @@ -27,9 +27,4 @@ spec: 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/velero.yaml b/packages/apps/kubernetes/templates/helmreleases/velero.yaml index 781b9c493..202e89b6f 100644 --- a/packages/apps/kubernetes/templates/helmreleases/velero.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/velero.yaml @@ -26,7 +26,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 {{- with .Values.addons.velero.valuesOverride }} @@ -35,10 +34,6 @@ spec: {{- end }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler-crds.yaml b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler-crds.yaml index 55a5faace..630e58e16 100644 --- a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler-crds.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler-crds.yaml @@ -27,10 +27,4 @@ spec: 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml index 74fb5a39b..58eeba315 100644 --- a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml @@ -52,16 +52,11 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 values: {{- toYaml (deepCopy .Values.addons.verticalPodAutoscaler.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultVPAValues" .))) | nindent 4 }} dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-monitoring-agents namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml index 7302f8f5c..d6c068ca6 100644 --- a/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml @@ -26,14 +26,9 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} - name: {{ .Release.Name }}-cilium namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-cert-manager-crds diff --git a/packages/apps/kubernetes/templates/helmreleases/volumesnapshot-crd.yaml b/packages/apps/kubernetes/templates/helmreleases/volumesnapshot-crd.yaml index d50fd93cb..9848c7d45 100644 --- a/packages/apps/kubernetes/templates/helmreleases/volumesnapshot-crd.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/volumesnapshot-crd.yaml @@ -26,12 +26,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 - dependsOn: - {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - {{- end }} {{- end }} diff --git a/packages/apps/nats/templates/nats.yaml b/packages/apps/nats/templates/nats.yaml index ebd9ef254..301a10981 100644 --- a/packages/apps/nats/templates/nats.yaml +++ b/packages/apps/nats/templates/nats.yaml @@ -47,7 +47,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/openbao/templates/openbao.yaml b/packages/apps/openbao/templates/openbao.yaml index daa6f9c4f..1b98fe2eb 100644 --- a/packages/apps/openbao/templates/openbao.yaml +++ b/packages/apps/openbao/templates/openbao.yaml @@ -15,7 +15,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/qdrant/templates/qdrant.yaml b/packages/apps/qdrant/templates/qdrant.yaml index 8813898ed..2aca225fb 100644 --- a/packages/apps/qdrant/templates/qdrant.yaml +++ b/packages/apps/qdrant/templates/qdrant.yaml @@ -16,7 +16,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml index 9a122da21..71e0b548d 100644 --- a/packages/apps/tenant/templates/etcd.yaml +++ b/packages/apps/tenant/templates/etcd.yaml @@ -23,7 +23,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/templates/gateway.yaml b/packages/apps/tenant/templates/gateway.yaml index 6e6d2ee0a..afb539811 100644 --- a/packages/apps/tenant/templates/gateway.yaml +++ b/packages/apps/tenant/templates/gateway.yaml @@ -23,7 +23,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/templates/info.yaml b/packages/apps/tenant/templates/info.yaml index 520028c10..b5a7550d1 100644 --- a/packages/apps/tenant/templates/info.yaml +++ b/packages/apps/tenant/templates/info.yaml @@ -22,7 +22,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml index 1899a4dae..229ee7c62 100644 --- a/packages/apps/tenant/templates/ingress.yaml +++ b/packages/apps/tenant/templates/ingress.yaml @@ -23,7 +23,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index 4d77faa6f..29dbf95ab 100644 --- a/packages/apps/tenant/templates/monitoring.yaml +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -23,7 +23,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml index e0002ec9a..c0a1cf0c0 100644 --- a/packages/apps/tenant/templates/seaweedfs.yaml +++ b/packages/apps/tenant/templates/seaweedfs.yaml @@ -23,7 +23,6 @@ spec: remediation: retries: -1 upgrade: - force: true remediation: retries: -1 valuesFrom: diff --git a/packages/apps/tenant/tests/no_upgrade_force_test.yaml b/packages/apps/tenant/tests/no_upgrade_force_test.yaml new file mode 100644 index 000000000..80be5a9c6 --- /dev/null +++ b/packages/apps/tenant/tests/no_upgrade_force_test.yaml @@ -0,0 +1,69 @@ +suite: tenant HelmReleases carry no deprecated upgrade.force + +# Flux v2.8 / helm-controller v1.5 deprecates `upgrade.force: true` and rejects +# it under Server-Side Apply. The flux-bump PR swept the flag off every tenant +# HelmRelease; gateway.yaml was missed in the first pass. This suite pins the +# invariant across all swept HRs so a stray `force: true` cannot creep back in. + +# Restrict rendering to the swept HelmRelease templates so the chart's +# namespace.yaml `lookup` (which errors under helm-unittest) is not evaluated. +templates: + - templates/etcd.yaml + - templates/info.yaml + - templates/ingress.yaml + - templates/monitoring.yaml + - templates/seaweedfs.yaml + - templates/gateway.yaml + +release: + name: tenant-test + namespace: tenant-test + +set: + _cluster: + expose-ingress: tenant-root + expose-external-ips: "192.0.2.10" + gateway-enabled: "true" + etcd: true + ingress: true + monitoring: true + seaweedfs: true + gateway: true + host: "" + +tests: + - it: etcd HR has no upgrade.force + asserts: + - template: templates/etcd.yaml + notExists: + path: spec.upgrade.force + + - it: info HR has no upgrade.force + asserts: + - template: templates/info.yaml + notExists: + path: spec.upgrade.force + + - it: ingress HR has no upgrade.force + asserts: + - template: templates/ingress.yaml + notExists: + path: spec.upgrade.force + + - it: monitoring HR has no upgrade.force + asserts: + - template: templates/monitoring.yaml + notExists: + path: spec.upgrade.force + + - it: seaweedfs HR has no upgrade.force + asserts: + - template: templates/seaweedfs.yaml + notExists: + path: spec.upgrade.force + + - it: gateway HR has no upgrade.force + asserts: + - template: templates/gateway.yaml + notExists: + path: spec.upgrade.force diff --git a/packages/apps/vm-instance/Makefile b/packages/apps/vm-instance/Makefile index 92798e4f3..deaeaf207 100644 --- a/packages/apps/vm-instance/Makefile +++ b/packages/apps/vm-instance/Makefile @@ -4,6 +4,12 @@ generate: cozyvalues-gen -m 'vminstance' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/vminstance/types.go #INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ # && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json - PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \ + # Union the upstream preference catalog with the Cozystack-local deprecated + # aliases in extra-instancetypes.yaml, so retained EOL profiles (e.g. + # centos.7*/centos.stream8*) stay in the enum and the dynamic CRD does not + # reject existing VMInstance CRs that reference them. + PREFERENCES=$$( { yq e '.metadata.name' ../../system/kubevirt-instancetypes/templates/preferences.yaml; \ + yq e 'select(.kind == "VirtualMachineClusterPreference") | .metadata.name' ../../system/kubevirt-instancetypes/templates/extra-instancetypes.yaml; } \ + | grep -E -v -- '^(---)?$$' | sort -u | jq -R . | jq -s '. + [""]' ) \ && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json ../../../hack/update-crd.sh diff --git a/packages/apps/vm-instance/README.md b/packages/apps/vm-instance/README.md index 9d6a52b27..c1a016073 100644 --- a/packages/apps/vm-instance/README.md +++ b/packages/apps/vm-instance/README.md @@ -184,20 +184,41 @@ The following instancetype resources are provided by Cozystack: Name | vCPUs | Memory -----|-------|------- cx1.2xlarge | 8 | 16Gi +cx1.2xlarge1gi | 8 | 16Gi cx1.4xlarge | 16 | 32Gi +cx1.4xlarge1gi | 16 | 32Gi cx1.8xlarge | 32 | 64Gi +cx1.8xlarge1gi | 32 | 64Gi cx1.large | 2 | 4Gi +cx1.large1gi | 2 | 4Gi cx1.medium | 1 | 2Gi +cx1.medium1gi | 1 | 2Gi cx1.xlarge | 4 | 8Gi +cx1.xlarge1gi | 4 | 8Gi +d1.2xlarge | 8 | 32Gi +d1.2xmedium | 2 | 4Gi +d1.4xlarge | 16 | 64Gi +d1.8xlarge | 32 | 128Gi +d1.large | 2 | 8Gi +d1.medium | 1 | 4Gi +d1.micro | 1 | 1Gi +d1.nano | 1 | 512Mi +d1.small | 1 | 2Gi +d1.xlarge | 4 | 16Gi gn1.2xlarge | 8 | 32Gi gn1.4xlarge | 16 | 64Gi gn1.8xlarge | 32 | 128Gi gn1.xlarge | 4 | 16Gi m1.2xlarge | 8 | 64Gi +m1.2xlarge1gi | 8 | 64Gi m1.4xlarge | 16 | 128Gi +m1.4xlarge1gi | 16 | 128Gi m1.8xlarge | 32 | 256Gi +m1.8xlarge1gi | 32 | 256Gi m1.large | 2 | 16Gi +m1.large1gi | 2 | 16Gi m1.xlarge | 4 | 32Gi +m1.xlarge1gi | 4 | 32Gi n1.2xlarge | 16 | 32Gi n1.4xlarge | 32 | 64Gi n1.8xlarge | 64 | 128Gi @@ -237,23 +258,26 @@ The following preference resources are provided by Cozystack: Name | Guest OS -----|--------- alpine | Alpine -centos.7 | CentOS 7 -centos.7.desktop | CentOS 7 centos.stream10 | CentOS Stream 10 centos.stream10.desktop | CentOS Stream 10 -centos.stream8 | CentOS Stream 8 -centos.stream8.desktop | CentOS Stream 8 -centos.stream8.dpdk | CentOS Stream 8 centos.stream9 | CentOS Stream 9 centos.stream9.desktop | CentOS Stream 9 centos.stream9.dpdk | CentOS Stream 9 cirros | Cirros +debian | Debian fedora | Fedora (amd64) fedora.arm64 | Fedora (arm64) +fedora.s390x | Fedora (s390x) +legacy | Legacy Guest +linux | Linux Guest +linux.efi | Linux EFI Guest +linux.virtiotransitional | Linux Virtio Transitional Guest opensuse.leap | OpenSUSE Leap opensuse.tumbleweed | OpenSUSE Tumbleweed -rhel.10 | Red Hat Enterprise Linux 10 Beta (amd64) -rhel.10.arm64 | Red Hat Enterprise Linux 10 Beta (arm64) +oraclelinux | Oracle Linux +rhel.10 | Red Hat Enterprise Linux 10 (amd64) +rhel.10.arm64 | Red Hat Enterprise Linux 10 (arm64) +rhel.10.s390x | Red Hat Enterprise Linux 10 (s390x) rhel.7 | Red Hat Enterprise Linux 7 rhel.7.desktop | Red Hat Enterprise Linux 7 rhel.8 | Red Hat Enterprise Linux 8 @@ -264,12 +288,15 @@ rhel.9.arm64 | Red Hat Enterprise Linux 9 (arm64) rhel.9.desktop | Red Hat Enterprise Linux 9 Desktop (amd64) rhel.9.dpdk | Red Hat Enterprise Linux 9 DPDK (amd64) rhel.9.realtime | Red Hat Enterprise Linux 9 Realtime (amd64) +rhel.9.s390x | Red Hat Enterprise Linux 9 (s390x) sles | SUSE Linux Enterprise Server ubuntu | Ubuntu windows.10 | Microsoft Windows 10 windows.10.virtio | Microsoft Windows 10 (virtio) windows.11 | Microsoft Windows 11 windows.11.virtio | Microsoft Windows 11 (virtio) +windows.2k12 | Microsoft Windows Server 2012/2012 R2 +windows.2k12.virtio | Microsoft Windows Server 2012/2012 R2 (virtio) windows.2k16 | Microsoft Windows Server 2016 windows.2k16.virtio | Microsoft Windows Server 2016 (virtio) windows.2k19 | Microsoft Windows Server 2019 @@ -278,3 +305,9 @@ windows.2k22 | Microsoft Windows Server 2022 windows.2k22.virtio | Microsoft Windows Server 2022 (virtio) windows.2k25 | Microsoft Windows Server 2025 windows.2k25.virtio | Microsoft Windows Server 2025 (virtio) +windows.2k3 | Microsoft Windows Server 2003 +windows.2k8 | Microsoft Windows Server 2008/2008 R2 +windows.2k8.virtio | Microsoft Windows Server 2008/2008 R2 (virtio) +windows.7 | Microsoft Windows 7 +windows.7.virtio | Microsoft Windows 7 (virtio) +windows.xp | Microsoft Windows XP diff --git a/packages/apps/vm-instance/templates/vm.yaml b/packages/apps/vm-instance/templates/vm.yaml index 55f278c1a..b6d20dfa6 100644 --- a/packages/apps/vm-instance/templates/vm.yaml +++ b/packages/apps/vm-instance/templates/vm.yaml @@ -67,14 +67,14 @@ spec: - name: disk-{{ $disk.name }} {{- $dv := lookup "cdi.kubevirt.io/v1beta1" "DataVolume" $.Release.Namespace (printf "vm-disk-%s" $disk.name) }} {{- if $dv }} - {{- if and (hasKey $dv.metadata.annotations "vm-disk.cozystack.io/optical") (eq (index $dv.metadata.annotations "vm-disk.cozystack.io/optical") "true") }} - cdrom: + {{- $isOptical := and (hasKey $dv.metadata.annotations "vm-disk.cozystack.io/optical") (eq (index $dv.metadata.annotations "vm-disk.cozystack.io/optical") "true") }} + {{- $deviceKey := ternary "cdrom" "disk" $isOptical }} + {{- if $disk.bus }} + {{ $deviceKey }}: + bus: {{ $disk.bus }} {{- else }} - disk: + {{ $deviceKey }}: {} {{- end }} - {{- with $disk.bus }} - bus: {{ . }} - {{- end }} bootOrder: {{ add $i 1 }} {{- else }} {{- fail (printf "Specified disk not exists in cluster: %s" .name) }} diff --git a/packages/apps/vm-instance/values.schema.json b/packages/apps/vm-instance/values.schema.json index 01bd30a95..d14100999 100644 --- a/packages/apps/vm-instance/values.schema.json +++ b/packages/apps/vm-instance/values.schema.json @@ -65,12 +65,20 @@ "centos.stream9.desktop", "centos.stream9.dpdk", "cirros", + "debian", "fedora", "fedora.arm64", + "fedora.s390x", + "legacy", + "linux", + "linux.efi", + "linux.virtiotransitional", "opensuse.leap", "opensuse.tumbleweed", + "oraclelinux", "rhel.10", "rhel.10.arm64", + "rhel.10.s390x", "rhel.7", "rhel.7.desktop", "rhel.8", @@ -81,12 +89,15 @@ "rhel.9.desktop", "rhel.9.dpdk", "rhel.9.realtime", + "rhel.9.s390x", "sles", "ubuntu", "windows.10", "windows.10.virtio", "windows.11", "windows.11.virtio", + "windows.2k12", + "windows.2k12.virtio", "windows.2k16", "windows.2k16.virtio", "windows.2k19", @@ -95,6 +106,12 @@ "windows.2k22.virtio", "windows.2k25", "windows.2k25.virtio", + "windows.2k3", + "windows.2k8", + "windows.2k8.virtio", + "windows.7", + "windows.7.virtio", + "windows.xp", "" ] }, diff --git a/packages/core/flux-aio/Makefile b/packages/core/flux-aio/Makefile index c5eb27f96..614b7f86c 100644 --- a/packages/core/flux-aio/Makefile +++ b/packages/core/flux-aio/Makefile @@ -22,3 +22,4 @@ update: -e 's|\.cluster\.local\.,||g' -e 's|\.cluster\.local\,||g' -e 's|\.cluster\.local\.||g' \ -e 's|--storage-adv-addr=source-watcher.$$(RUNTIME_NAMESPACE).svc|--storage-adv-addr=flux.$$(RUNTIME_NAMESPACE).svc|' yq eval '.spec.template.spec.containers[0].image = "'"$$(yq eval 'select(.kind == "Deployment" and .metadata.name == "flux") | .spec.template.spec.containers[] | select(.name == "helm-controller").image' $(MANIFESTS_DIR)/fluxcd.yaml)"'"' -i $(MANIFESTS_DIR)/fluxcd-tenants.yaml + yq eval '.metadata.labels."app.kubernetes.io/version" = "'"$$(yq eval 'select(.kind == "Deployment" and .metadata.name == "flux") | .metadata.labels."app.kubernetes.io/version"' $(MANIFESTS_DIR)/fluxcd.yaml)"'"' -i $(MANIFESTS_DIR)/fluxcd-tenants.yaml diff --git a/packages/core/platform/images/migrations/migrations/43 b/packages/core/platform/images/migrations/migrations/43 new file mode 100755 index 000000000..0c421d1fc --- /dev/null +++ b/packages/core/platform/images/migrations/migrations/43 @@ -0,0 +1,47 @@ +#!/bin/sh +# Migration 43 --> 44 +# Adopt existing Cluster/seaweedfs-db resources into the new seaweedfs-db +# HelmRelease introduced in this release. +# +# Pre-split, the CNPG Cluster lived inside the seaweedfs-system Helm release. +# Splitting moves it to a new release named seaweedfs-db. We rewrite the +# helm ownership annotations so Helm adopts the existing Cluster instead of +# erroring on the next reconcile, and stamp helm.sh/resource-policy: keep +# so the seaweedfs-system upgrade (which no longer renders the Cluster) does +# not delete it during the transition. + +set -euo pipefail + +# Iterate every namespace that has a Cluster named "seaweedfs-db". +for ns in $(kubectl get cluster.postgresql.cnpg.io -A \ + -o jsonpath='{range .items[?(@.metadata.name=="seaweedfs-db")]}{.metadata.namespace}{"\n"}{end}'); do + current=$(kubectl get cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \ + -o jsonpath='{.metadata.annotations.meta\.helm\.sh/release-name}' 2>/dev/null || true) + if [ "$current" = "seaweedfs-system" ]; then + echo "Re-annotating Cluster/seaweedfs-db in $ns: seaweedfs-system -> seaweedfs-db" + kubectl annotate cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \ + meta.helm.sh/release-name=seaweedfs-db \ + helm.sh/resource-policy=keep \ + --overwrite + # release-namespace stays the same (tenant namespace, e.g. tenant-root) + fi +done + +# Stamp version. +# Mirror migration 42's labeled manifest. A label-less apply by the same field +# manager (kubectl create | kubectl apply) would strip the +# platform.cozystack.io/no-delete label migration 42 added, dropping +# cozystack-version out of the cozystack-no-delete-guardrail +# ValidatingAdmissionPolicy. templates/cozystack-version.yaml only re-renders the +# labeled ConfigMap on first install, so the label must be carried inline here. +kubectl apply --filename - < templates/preferences.yaml + kustomize build https://github.com/kubevirt/common-instancetypes/preferences?ref=$(COMMON_INSTANCETYPES_REF) > templates/preferences.yaml yq -i 'select(.kind != "VirtualMachinePreference")' templates/preferences.yaml - kustomize build https://github.com/kubevirt/common-instancetypes/instancetypes > templates/instancetypes.yaml + kustomize build https://github.com/kubevirt/common-instancetypes/instancetypes?ref=$(COMMON_INSTANCETYPES_REF) > templates/instancetypes.yaml yq -i 'select(.kind != "VirtualMachineInstancetype")' templates/instancetypes.yaml - sed -i '/persistent: true/d' templates/preferences.yaml + # Re-append Cozystack-local instancetypes the pinned catalog no longer ships + # but existing workloads still reference (see extra-instancetypes.yaml). + cp extra-instancetypes.yaml templates/extra-instancetypes.yaml diff --git a/packages/system/kubevirt-instancetypes/extra-instancetypes.yaml b/packages/system/kubevirt-instancetypes/extra-instancetypes.yaml new file mode 100644 index 000000000..d29a2064f --- /dev/null +++ b/packages/system/kubevirt-instancetypes/extra-instancetypes.yaml @@ -0,0 +1,308 @@ +# Cozystack-local instancetypes retained on top of the pinned upstream +# common-instancetypes catalog (see Makefile `update`). +# +# The gn1.* (GPU NVIDIA) series was removed upstream in common-instancetypes +# v1.3.0, but existing GPU VMs and tenant Kubernetes GPU worker pools still +# reference these names, and packages/apps/vm-instance/templates/vm.yaml fails +# the Helm render when a referenced VirtualMachineClusterInstancetype is absent. +# These objects are appended to templates/ verbatim from the pre-v1.3.0 catalog +# to keep those workloads renderable. They are marked deprecated upstream; new +# GPU instancetypes should be defined explicitly rather than extending this set. +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "8" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 32Gi + instancetype.kubevirt.io/size: 2xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.2xlarge +spec: + cpu: + guest: 8 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 32Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "16" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 64Gi + instancetype.kubevirt.io/size: 4xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.4xlarge +spec: + cpu: + guest: 16 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 64Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "32" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 128Gi + instancetype.kubevirt.io/size: 8xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.8xlarge +spec: + cpu: + guest: 32 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 128Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "4" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 16Gi + instancetype.kubevirt.io/size: xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.xlarge +spec: + cpu: + guest: 4 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 16Gi +--- +# The centos.7* / centos.stream8* VirtualMachineClusterPreference objects below +# reached end-of-life and were dropped from common-instancetypes upstream, but +# existing VMInstance CRs still reference these instanceProfile names. vm.yaml +# fails the Helm render when a referenced VirtualMachineClusterPreference is +# absent (and the dynamic CRD enum would reject the stored value), so existing +# VMs on these profiles would hard-break on upgrade. They are retained here +# verbatim from the pre-removal catalog, marked deprecated, to keep those +# workloads renderable. New VMs should use a supported centos.stream9/10 profile. +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS 7 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.7 +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS 7 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.7.desktop +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS Stream 8 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.stream8 +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS Stream 8 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.stream8.desktop +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS Stream 8 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream,dpdk + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.stream8.dpdk +spec: + annotations: + vm.kubevirt.io/os: linux + cpu: + preferredCPUTopology: spread + spreadOptions: + across: SocketsCoresThreads + ratio: 4 + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredNetworkInterfaceMultiQueue: true + requirements: + cpu: + guest: 2 + memory: + guest: 1.5Gi diff --git a/packages/system/kubevirt-instancetypes/templates/extra-instancetypes.yaml b/packages/system/kubevirt-instancetypes/templates/extra-instancetypes.yaml new file mode 100644 index 000000000..d29a2064f --- /dev/null +++ b/packages/system/kubevirt-instancetypes/templates/extra-instancetypes.yaml @@ -0,0 +1,308 @@ +# Cozystack-local instancetypes retained on top of the pinned upstream +# common-instancetypes catalog (see Makefile `update`). +# +# The gn1.* (GPU NVIDIA) series was removed upstream in common-instancetypes +# v1.3.0, but existing GPU VMs and tenant Kubernetes GPU worker pools still +# reference these names, and packages/apps/vm-instance/templates/vm.yaml fails +# the Helm render when a referenced VirtualMachineClusterInstancetype is absent. +# These objects are appended to templates/ verbatim from the pre-v1.3.0 catalog +# to keep those workloads renderable. They are marked deprecated upstream; new +# GPU instancetypes should be defined explicitly rather than extending this set. +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "8" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 32Gi + instancetype.kubevirt.io/size: 2xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.2xlarge +spec: + cpu: + guest: 8 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 32Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "16" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 64Gi + instancetype.kubevirt.io/size: 4xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.4xlarge +spec: + cpu: + guest: 16 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 64Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "32" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 128Gi + instancetype.kubevirt.io/size: 8xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.8xlarge +spec: + cpu: + guest: 32 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 128Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The GN Series provides instances types intended for VMs with + NVIDIA GPU resources attached. + + *GN* is the abbreviation of "GPU NVIDIA". + + This series is intended to be used with VMs consuming GPUs + provided by the + [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) + which can be installed on Kubernetes and also is made available + on OpenShift via OperatorHub. + instancetype.kubevirt.io/displayName: GPU NVIDIA + labels: + instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/cpu: "4" + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/gpus: "true" + instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/memory: 16Gi + instancetype.kubevirt.io/size: xlarge + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: gn1.xlarge +spec: + cpu: + guest: 4 + gpus: + - deviceName: nvidia.com/A400 + name: gpu1 + memory: + guest: 16Gi +--- +# The centos.7* / centos.stream8* VirtualMachineClusterPreference objects below +# reached end-of-life and were dropped from common-instancetypes upstream, but +# existing VMInstance CRs still reference these instanceProfile names. vm.yaml +# fails the Helm render when a referenced VirtualMachineClusterPreference is +# absent (and the dynamic CRD enum would reject the stored value), so existing +# VMs on these profiles would hard-break on upgrade. They are retained here +# verbatim from the pre-removal catalog, marked deprecated, to keep those +# workloads renderable. New VMs should use a supported centos.stream9/10 profile. +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS 7 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.7 +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS 7 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.7.desktop +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS Stream 8 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.stream8 +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS Stream 8 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.stream8.desktop +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + requirements: + cpu: + guest: 1 + memory: + guest: 1.5Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-centos + openshift.io/display-name: CentOS Stream 8 + openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + tags: hidden,kubevirt,linux,centos-stream,dpdk + labels: + instancetype.kubevirt.io/deprecated: "true" + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: centos.stream8.dpdk +spec: + annotations: + vm.kubevirt.io/os: linux + cpu: + preferredCPUTopology: spread + spreadOptions: + across: SocketsCoresThreads + ratio: 4 + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredNetworkInterfaceMultiQueue: true + requirements: + cpu: + guest: 2 + memory: + guest: 1.5Gi diff --git a/packages/system/kubevirt-instancetypes/templates/instancetypes.yaml b/packages/system/kubevirt-instancetypes/templates/instancetypes.yaml index a4dfe2e9b..76cd28fc6 100644 --- a/packages/system/kubevirt-instancetypes/templates/instancetypes.yaml +++ b/packages/system/kubevirt-instancetypes/templates/instancetypes.yaml @@ -14,12 +14,21 @@ metadata: 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. instancetype.kubevirt.io/displayName: Compute Exclusive labels: instancetype.kubevirt.io/class: compute.exclusive instancetype.kubevirt.io/cpu: "8" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: pficon-registry instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 16Gi @@ -33,6 +42,7 @@ spec: dedicatedCPUPlacement: true guest: 8 isolateEmulatorThread: true + maxSockets: 8 numa: guestMappingPassthrough: {} ioThreadsPolicy: auto @@ -57,12 +67,74 @@ metadata: 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. + instancetype.kubevirt.io/displayName: Compute Exclusive + labels: + instancetype.kubevirt.io/class: compute.exclusive + instancetype.kubevirt.io/cpu: "8" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: pficon-registry + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 16Gi + instancetype.kubevirt.io/numa: "true" + instancetype.kubevirt.io/size: 2xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: cx1.2xlarge1gi +spec: + cpu: + dedicatedCPUPlacement: true + guest: 8 + isolateEmulatorThread: true + maxSockets: 8 + numa: + guestMappingPassthrough: {} + ioThreadsPolicy: auto + memory: + guest: 16Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. instancetype.kubevirt.io/displayName: Compute Exclusive labels: instancetype.kubevirt.io/class: compute.exclusive instancetype.kubevirt.io/cpu: "16" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: pficon-registry instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 32Gi @@ -76,6 +148,7 @@ spec: dedicatedCPUPlacement: true guest: 16 isolateEmulatorThread: true + maxSockets: 16 numa: guestMappingPassthrough: {} ioThreadsPolicy: auto @@ -100,12 +173,74 @@ metadata: 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. + instancetype.kubevirt.io/displayName: Compute Exclusive + labels: + instancetype.kubevirt.io/class: compute.exclusive + instancetype.kubevirt.io/cpu: "16" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: pficon-registry + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 32Gi + instancetype.kubevirt.io/numa: "true" + instancetype.kubevirt.io/size: 4xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: cx1.4xlarge1gi +spec: + cpu: + dedicatedCPUPlacement: true + guest: 16 + isolateEmulatorThread: true + maxSockets: 16 + numa: + guestMappingPassthrough: {} + ioThreadsPolicy: auto + memory: + guest: 32Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. instancetype.kubevirt.io/displayName: Compute Exclusive labels: instancetype.kubevirt.io/class: compute.exclusive instancetype.kubevirt.io/cpu: "32" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: pficon-registry instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 64Gi @@ -119,6 +254,7 @@ spec: dedicatedCPUPlacement: true guest: 32 isolateEmulatorThread: true + maxSockets: 32 numa: guestMappingPassthrough: {} ioThreadsPolicy: auto @@ -143,12 +279,74 @@ metadata: 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. + instancetype.kubevirt.io/displayName: Compute Exclusive + labels: + instancetype.kubevirt.io/class: compute.exclusive + instancetype.kubevirt.io/cpu: "32" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: pficon-registry + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 64Gi + instancetype.kubevirt.io/numa: "true" + instancetype.kubevirt.io/size: 8xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: cx1.8xlarge1gi +spec: + cpu: + dedicatedCPUPlacement: true + guest: 32 + isolateEmulatorThread: true + maxSockets: 32 + numa: + guestMappingPassthrough: {} + ioThreadsPolicy: auto + memory: + guest: 64Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. instancetype.kubevirt.io/displayName: Compute Exclusive labels: instancetype.kubevirt.io/class: compute.exclusive instancetype.kubevirt.io/cpu: "2" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: pficon-registry instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 4Gi @@ -162,6 +360,7 @@ spec: dedicatedCPUPlacement: true guest: 2 isolateEmulatorThread: true + maxSockets: 2 numa: guestMappingPassthrough: {} ioThreadsPolicy: auto @@ -186,12 +385,74 @@ metadata: 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. + instancetype.kubevirt.io/displayName: Compute Exclusive + labels: + instancetype.kubevirt.io/class: compute.exclusive + instancetype.kubevirt.io/cpu: "2" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: pficon-registry + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 4Gi + instancetype.kubevirt.io/numa: "true" + instancetype.kubevirt.io/size: large1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: cx1.large1gi +spec: + cpu: + dedicatedCPUPlacement: true + guest: 2 + isolateEmulatorThread: true + maxSockets: 2 + numa: + guestMappingPassthrough: {} + ioThreadsPolicy: auto + memory: + guest: 4Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. instancetype.kubevirt.io/displayName: Compute Exclusive labels: instancetype.kubevirt.io/class: compute.exclusive instancetype.kubevirt.io/cpu: "1" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: pficon-registry instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 2Gi @@ -205,6 +466,7 @@ spec: dedicatedCPUPlacement: true guest: 1 isolateEmulatorThread: true + maxSockets: 1 numa: guestMappingPassthrough: {} ioThreadsPolicy: auto @@ -229,12 +491,74 @@ metadata: 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. + instancetype.kubevirt.io/displayName: Compute Exclusive + labels: + instancetype.kubevirt.io/class: compute.exclusive + instancetype.kubevirt.io/cpu: "1" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: pficon-registry + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 2Gi + instancetype.kubevirt.io/numa: "true" + instancetype.kubevirt.io/size: medium1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: cx1.medium1gi +spec: + cpu: + dedicatedCPUPlacement: true + guest: 1 + isolateEmulatorThread: true + maxSockets: 1 + numa: + guestMappingPassthrough: {} + ioThreadsPolicy: auto + memory: + guest: 2Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. instancetype.kubevirt.io/displayName: Compute Exclusive labels: instancetype.kubevirt.io/class: compute.exclusive instancetype.kubevirt.io/cpu: "4" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: pficon-registry instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 8Gi @@ -248,6 +572,7 @@ spec: dedicatedCPUPlacement: true guest: 4 isolateEmulatorThread: true + maxSockets: 4 numa: guestMappingPassthrough: {} ioThreadsPolicy: auto @@ -261,34 +586,85 @@ kind: VirtualMachineClusterInstancetype metadata: annotations: instancetype.kubevirt.io/description: |- - The GN Series provides instances types intended for VMs with - NVIDIA GPU resources attached. + The CX Series provides exclusive compute resources for compute + intensive applications. - *GN* is the abbreviation of "GPU NVIDIA". + *CX* is the abbreviation of "Compute Exclusive". - This series is intended to be used with VMs consuming GPUs - provided by the - [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) - which can be installed on Kubernetes and also is made available - on OpenShift via OperatorHub. - instancetype.kubevirt.io/displayName: GPU NVIDIA + 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. + + The amount of spec.cpu.maxSockets is set to the same as + guest cpus. This avoids KubeVirt's default behavior of + providing extra CPUs for hotplugging, which can exceed the + amount of available CPUs on a node and cause the VM to fail. + + Requirements for CX series instance types: + - CPU manager has to be enabled. + - Huge pages have to be available on the nodes. + instancetype.kubevirt.io/displayName: Compute Exclusive labels: - instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/class: compute.exclusive + instancetype.kubevirt.io/cpu: "4" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: pficon-registry + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 8Gi + instancetype.kubevirt.io/numa: "true" + instancetype.kubevirt.io/size: xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: cx1.xlarge1gi +spec: + cpu: + dedicatedCPUPlacement: true + guest: 4 + isolateEmulatorThread: true + maxSockets: 4 + numa: + guestMappingPassthrough: {} + ioThreadsPolicy: auto + memory: + guest: 8Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu instancetype.kubevirt.io/cpu: "8" - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/gpus: "true" - instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 32Gi instancetype.kubevirt.io/size: 2xlarge instancetype.kubevirt.io/vendor: kubevirt.io instancetype.kubevirt.io/version: "1" - name: gn1.2xlarge + name: d1.2xlarge spec: cpu: + dedicatedCPUPlacement: true guest: 8 - gpus: - - deviceName: nvidia.com/A400 - name: gpu1 + isolateEmulatorThread: true + ioThreadsPolicy: auto memory: guest: 32Gi --- @@ -297,34 +673,66 @@ kind: VirtualMachineClusterInstancetype metadata: annotations: instancetype.kubevirt.io/description: |- - The GN Series provides instances types intended for VMs with - NVIDIA GPU resources attached. + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. - *GN* is the abbreviation of "GPU NVIDIA". + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. - This series is intended to be used with VMs consuming GPUs - provided by the - [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) - which can be installed on Kubernetes and also is made available - on OpenShift via OperatorHub. - instancetype.kubevirt.io/displayName: GPU NVIDIA + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU labels: - instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/class: dedicated.vcpu + instancetype.kubevirt.io/cpu: "2" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 4Gi + instancetype.kubevirt.io/size: 2xmedium + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: d1.2xmedium +spec: + cpu: + dedicatedCPUPlacement: true + guest: 2 + isolateEmulatorThread: true + ioThreadsPolicy: auto + memory: + guest: 4Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu instancetype.kubevirt.io/cpu: "16" - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/gpus: "true" - instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 64Gi instancetype.kubevirt.io/size: 4xlarge instancetype.kubevirt.io/vendor: kubevirt.io instancetype.kubevirt.io/version: "1" - name: gn1.4xlarge + name: d1.4xlarge spec: cpu: + dedicatedCPUPlacement: true guest: 16 - gpus: - - deviceName: nvidia.com/A400 - name: gpu1 + isolateEmulatorThread: true + ioThreadsPolicy: auto memory: guest: 64Gi --- @@ -333,34 +741,32 @@ kind: VirtualMachineClusterInstancetype metadata: annotations: instancetype.kubevirt.io/description: |- - The GN Series provides instances types intended for VMs with - NVIDIA GPU resources attached. + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. - *GN* is the abbreviation of "GPU NVIDIA". + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. - This series is intended to be used with VMs consuming GPUs - provided by the - [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) - which can be installed on Kubernetes and also is made available - on OpenShift via OperatorHub. - instancetype.kubevirt.io/displayName: GPU NVIDIA + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU labels: - instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/class: dedicated.vcpu instancetype.kubevirt.io/cpu: "32" - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/gpus: "true" - instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 128Gi instancetype.kubevirt.io/size: 8xlarge instancetype.kubevirt.io/vendor: kubevirt.io instancetype.kubevirt.io/version: "1" - name: gn1.8xlarge + name: d1.8xlarge spec: cpu: + dedicatedCPUPlacement: true guest: 32 - gpus: - - deviceName: nvidia.com/A400 - name: gpu1 + isolateEmulatorThread: true + ioThreadsPolicy: auto memory: guest: 128Gi --- @@ -369,34 +775,202 @@ kind: VirtualMachineClusterInstancetype metadata: annotations: instancetype.kubevirt.io/description: |- - The GN Series provides instances types intended for VMs with - NVIDIA GPU resources attached. + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. - *GN* is the abbreviation of "GPU NVIDIA". + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. - This series is intended to be used with VMs consuming GPUs - provided by the - [NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) - which can be installed on Kubernetes and also is made available - on OpenShift via OperatorHub. - instancetype.kubevirt.io/displayName: GPU NVIDIA + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU labels: - instancetype.kubevirt.io/class: gpu.nvidia + instancetype.kubevirt.io/class: dedicated.vcpu + instancetype.kubevirt.io/cpu: "2" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 8Gi + instancetype.kubevirt.io/size: large + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: d1.large +spec: + cpu: + dedicatedCPUPlacement: true + guest: 2 + isolateEmulatorThread: true + ioThreadsPolicy: auto + memory: + guest: 8Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu + instancetype.kubevirt.io/cpu: "1" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 4Gi + instancetype.kubevirt.io/size: medium + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: d1.medium +spec: + cpu: + dedicatedCPUPlacement: true + guest: 1 + isolateEmulatorThread: true + ioThreadsPolicy: auto + memory: + guest: 4Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu + instancetype.kubevirt.io/cpu: "1" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 1Gi + instancetype.kubevirt.io/size: micro + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: d1.micro +spec: + cpu: + dedicatedCPUPlacement: true + guest: 1 + isolateEmulatorThread: true + ioThreadsPolicy: auto + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu + instancetype.kubevirt.io/cpu: "1" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 512Mi + instancetype.kubevirt.io/size: nano + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: d1.nano +spec: + cpu: + dedicatedCPUPlacement: true + guest: 1 + isolateEmulatorThread: true + ioThreadsPolicy: auto + memory: + guest: 512Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu + instancetype.kubevirt.io/cpu: "1" + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" + instancetype.kubevirt.io/memory: 2Gi + instancetype.kubevirt.io/size: small + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: d1.small +spec: + cpu: + dedicatedCPUPlacement: true + guest: 1 + isolateEmulatorThread: true + ioThreadsPolicy: auto + memory: + guest: 2Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The D Series is designed for consistent and predictable performance, + providing resources for general purpose applications. + + *D* is the abbreviation for "Dedicated", reflecting the use of + dedicated CPU placement for workloads. + + VMs of this instance type are assigned exclusive physical CPU cores, + avoiding CPU sharing and time-slice contention with other VMs. + instancetype.kubevirt.io/displayName: Dedicated vCPU + labels: + instancetype.kubevirt.io/class: dedicated.vcpu instancetype.kubevirt.io/cpu: "4" - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/gpus: "true" - instancetype.kubevirt.io/icon-pf: fa-microchip + instancetype.kubevirt.io/dedicatedCPUPlacement: "true" + instancetype.kubevirt.io/icon-pf: pficon-server-group + instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 16Gi instancetype.kubevirt.io/size: xlarge instancetype.kubevirt.io/vendor: kubevirt.io instancetype.kubevirt.io/version: "1" - name: gn1.xlarge + name: d1.xlarge spec: cpu: + dedicatedCPUPlacement: true guest: 4 - gpus: - - deviceName: nvidia.com/A400 - name: gpu1 + isolateEmulatorThread: true + ioThreadsPolicy: auto memory: guest: 16Gi --- @@ -413,7 +987,7 @@ metadata: labels: instancetype.kubevirt.io/class: memory.intensive instancetype.kubevirt.io/cpu: "8" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: fa-memory instancetype.kubevirt.io/memory: 64Gi instancetype.kubevirt.io/size: 2xlarge @@ -439,9 +1013,37 @@ metadata: *M* is the abbreviation of "Memory". instancetype.kubevirt.io/displayName: Memory Intensive labels: + instancetype.kubevirt.io/class: memory.intensive + instancetype.kubevirt.io/cpu: "8" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: fa-memory + instancetype.kubevirt.io/memory: 64Gi + instancetype.kubevirt.io/size: 2xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: m1.2xlarge1gi +spec: + cpu: + guest: 8 + memory: + guest: 64Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The M Series provides resources for memory intensive + applications. + + *M* is the abbreviation of "Memory". + instancetype.kubevirt.io/displayName: Memory Intensive + labels: instancetype.kubevirt.io/class: memory.intensive instancetype.kubevirt.io/cpu: "16" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: fa-memory instancetype.kubevirt.io/memory: 128Gi instancetype.kubevirt.io/size: 4xlarge @@ -467,9 +1069,37 @@ metadata: *M* is the abbreviation of "Memory". instancetype.kubevirt.io/displayName: Memory Intensive labels: + instancetype.kubevirt.io/class: memory.intensive + instancetype.kubevirt.io/cpu: "16" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: fa-memory + instancetype.kubevirt.io/memory: 128Gi + instancetype.kubevirt.io/size: 4xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: m1.4xlarge1gi +spec: + cpu: + guest: 16 + memory: + guest: 128Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The M Series provides resources for memory intensive + applications. + + *M* is the abbreviation of "Memory". + instancetype.kubevirt.io/displayName: Memory Intensive + labels: instancetype.kubevirt.io/class: memory.intensive instancetype.kubevirt.io/cpu: "32" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: fa-memory instancetype.kubevirt.io/memory: 256Gi instancetype.kubevirt.io/size: 8xlarge @@ -495,9 +1125,37 @@ metadata: *M* is the abbreviation of "Memory". instancetype.kubevirt.io/displayName: Memory Intensive labels: + instancetype.kubevirt.io/class: memory.intensive + instancetype.kubevirt.io/cpu: "32" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: fa-memory + instancetype.kubevirt.io/memory: 256Gi + instancetype.kubevirt.io/size: 8xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: m1.8xlarge1gi +spec: + cpu: + guest: 32 + memory: + guest: 256Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The M Series provides resources for memory intensive + applications. + + *M* is the abbreviation of "Memory". + instancetype.kubevirt.io/displayName: Memory Intensive + labels: instancetype.kubevirt.io/class: memory.intensive instancetype.kubevirt.io/cpu: "2" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: fa-memory instancetype.kubevirt.io/memory: 16Gi instancetype.kubevirt.io/size: large @@ -523,9 +1181,37 @@ metadata: *M* is the abbreviation of "Memory". instancetype.kubevirt.io/displayName: Memory Intensive labels: + instancetype.kubevirt.io/class: memory.intensive + instancetype.kubevirt.io/cpu: "2" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: fa-memory + instancetype.kubevirt.io/memory: 16Gi + instancetype.kubevirt.io/size: large1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: m1.large1gi +spec: + cpu: + guest: 2 + memory: + guest: 16Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The M Series provides resources for memory intensive + applications. + + *M* is the abbreviation of "Memory". + instancetype.kubevirt.io/displayName: Memory Intensive + labels: instancetype.kubevirt.io/class: memory.intensive instancetype.kubevirt.io/cpu: "4" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 2Mi instancetype.kubevirt.io/icon-pf: fa-memory instancetype.kubevirt.io/memory: 32Gi instancetype.kubevirt.io/size: xlarge @@ -542,6 +1228,34 @@ spec: --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterInstancetype +metadata: + annotations: + instancetype.kubevirt.io/description: |- + The M Series provides resources for memory intensive + applications. + + *M* is the abbreviation of "Memory". + instancetype.kubevirt.io/displayName: Memory Intensive + labels: + instancetype.kubevirt.io/class: memory.intensive + instancetype.kubevirt.io/cpu: "4" + instancetype.kubevirt.io/hugepages: 1Gi + instancetype.kubevirt.io/icon-pf: fa-memory + instancetype.kubevirt.io/memory: 32Gi + instancetype.kubevirt.io/size: xlarge1gi + instancetype.kubevirt.io/vendor: kubevirt.io + instancetype.kubevirt.io/version: "1" + name: m1.xlarge1gi +spec: + cpu: + guest: 4 + memory: + guest: 32Gi + hugepages: + pageSize: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterInstancetype metadata: annotations: instancetype.kubevirt.io/description: |- @@ -558,7 +1272,7 @@ metadata: instancetype.kubevirt.io/class: network instancetype.kubevirt.io/cpu: "16" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-network instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 32Gi @@ -598,7 +1312,7 @@ metadata: instancetype.kubevirt.io/class: network instancetype.kubevirt.io/cpu: "32" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-network instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 64Gi @@ -638,7 +1352,7 @@ metadata: instancetype.kubevirt.io/class: network instancetype.kubevirt.io/cpu: "64" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-network instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 128Gi @@ -678,7 +1392,7 @@ metadata: instancetype.kubevirt.io/class: network instancetype.kubevirt.io/cpu: "4" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-network instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 8Gi @@ -718,7 +1432,7 @@ metadata: instancetype.kubevirt.io/class: network instancetype.kubevirt.io/cpu: "4" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-network instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 4Gi @@ -758,7 +1472,7 @@ metadata: instancetype.kubevirt.io/class: network instancetype.kubevirt.io/cpu: "8" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-network instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 16Gi @@ -1030,7 +1744,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "8" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 32Gi @@ -1073,7 +1787,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "16" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 64Gi @@ -1116,7 +1830,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "32" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 128Gi @@ -1159,7 +1873,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "2" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 8Gi @@ -1202,7 +1916,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "1" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 4Gi @@ -1245,7 +1959,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "1" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 1Gi @@ -1288,7 +2002,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "1" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 2Gi @@ -1331,7 +2045,7 @@ metadata: instancetype.kubevirt.io/class: realtime instancetype.kubevirt.io/cpu: "4" instancetype.kubevirt.io/dedicatedCPUPlacement: "true" - instancetype.kubevirt.io/hugepages: "true" + instancetype.kubevirt.io/hugepages: 1Gi instancetype.kubevirt.io/icon-pf: pficon-server-group instancetype.kubevirt.io/isolateEmulatorThread: "true" instancetype.kubevirt.io/memory: 16Gi diff --git a/packages/system/kubevirt-instancetypes/templates/preferences.yaml b/packages/system/kubevirt-instancetypes/templates/preferences.yaml index 67af459ae..458d8bd7b 100644 --- a/packages/system/kubevirt-instancetypes/templates/preferences.yaml +++ b/packages/system/kubevirt-instancetypes/templates/preferences.yaml @@ -4,12 +4,16 @@ metadata: annotations: iconClass: icon-alpine openshift.io/display-name: Alpine - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,alpine labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 512Mi instancetype.kubevirt.io/vendor: kubevirt.io name: alpine spec: @@ -18,6 +22,7 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + preferredRng: {} requirements: cpu: guest: 1 @@ -26,73 +31,20 @@ spec: --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-centos - openshift.io/display-name: CentOS 7 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,centos-stream - labels: - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: centos.7 -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredDiskBus: virtio - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-centos - openshift.io/display-name: CentOS 7 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,centos-stream - labels: - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: centos.7.desktop -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredAutoattachInputDevice: true - preferredDiskBus: virtio - preferredInputBus: virtio - preferredInputType: tablet - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-centos openshift.io/display-name: CentOS Stream 10 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,centos-stream labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: centos.stream10 spec: @@ -115,12 +67,16 @@ metadata: annotations: iconClass: icon-centos openshift.io/display-name: CentOS Stream 10 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,centos-stream labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: centos.stream10.desktop spec: @@ -142,106 +98,20 @@ spec: --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-centos - openshift.io/display-name: CentOS Stream 8 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,centos-stream - labels: - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: centos.stream8 -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredDiskBus: virtio - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1.5Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-centos - openshift.io/display-name: CentOS Stream 8 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,centos-stream - labels: - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: centos.stream8.desktop -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredAutoattachInputDevice: true - preferredDiskBus: virtio - preferredInputBus: virtio - preferredInputType: tablet - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1.5Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-centos - openshift.io/display-name: CentOS Stream 8 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,centos-stream,dpdk - labels: - instancetype.kubevirt.io/deprecated: "true" - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: centos.stream8.dpdk -spec: - annotations: - vm.kubevirt.io/os: linux - cpu: - preferredCPUTopology: spread - spreadOptions: - across: SocketsCoresThreads - ratio: 4 - devices: - preferredDiskBus: virtio - preferredInterfaceModel: virtio - preferredNetworkInterfaceMultiQueue: true - requirements: - cpu: - guest: 2 - memory: - guest: 1.5Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-centos openshift.io/display-name: CentOS Stream 9 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,centos-stream labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: centos.stream9 spec: @@ -264,12 +134,16 @@ metadata: annotations: iconClass: icon-centos openshift.io/display-name: CentOS Stream 9 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,centos-stream labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: centos.stream9.desktop spec: @@ -295,12 +169,16 @@ metadata: annotations: iconClass: icon-centos openshift.io/display-name: CentOS Stream 9 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,centos-stream,dpdk labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "8" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: centos.stream9.dpdk spec: @@ -319,7 +197,7 @@ spec: preferredRng: {} requirements: cpu: - guest: 2 + guest: 8 memory: guest: 1.5Gi --- @@ -329,12 +207,16 @@ metadata: annotations: iconClass: icon-cirros openshift.io/display-name: Cirros - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,cirros labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 256Mi instancetype.kubevirt.io/vendor: kubevirt.io name: cirros spec: @@ -343,6 +225,7 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio + preferredRng: {} requirements: cpu: guest: 1 @@ -351,17 +234,57 @@ spec: --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-debian + openshift.io/display-name: Debian + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,debian + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 512Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: debian +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} + firmware: + preferredEfi: + secureBoot: false + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-fedora openshift.io/display-name: Fedora (amd64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,fedora labels: instancetype.kubevirt.io/arch: amd64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: amd64 + instancetype.kubevirt.io/required-architecture: amd64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: fedora spec: @@ -370,14 +293,15 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio - preferredNetworkInterfaceMultiQueue: true preferredRng: {} features: preferredSmm: {} firmware: preferredEfi: secureBoot: true + preferredArchitecture: amd64 requirements: + architecture: amd64 cpu: guest: 1 memory: @@ -389,13 +313,19 @@ metadata: annotations: iconClass: icon-fedora openshift.io/display-name: Fedora (arm64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,fedora labels: instancetype.kubevirt.io/arch: arm64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: arm64 + instancetype.kubevirt.io/required-architecture: arm64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: fedora.arm64 spec: @@ -404,9 +334,10 @@ spec: devices: preferredDiskBus: virtio preferredInterfaceModel: virtio - preferredNetworkInterfaceMultiQueue: true preferredRng: {} + preferredArchitecture: arm64 requirements: + architecture: arm64 cpu: guest: 1 memory: @@ -414,16 +345,155 @@ spec: --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-fedora + openshift.io/display-name: Fedora (s390x) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,fedora + labels: + instancetype.kubevirt.io/arch: s390x + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: s390x + instancetype.kubevirt.io/required-architecture: s390x + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: fedora.s390x +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} + preferredArchitecture: s390x + requirements: + architecture: s390x + cpu: + guest: 1 + memory: + guest: 2Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-other + openshift.io/display-name: Legacy Guest + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,legacy + labels: + instancetype.kubevirt.io/os-type: legacy + instancetype.kubevirt.io/vendor: kubevirt.io + name: legacy +spec: + annotations: + vm.kubevirt.io/os: legacy + devices: + preferredDiskBus: sata + preferredInterfaceModel: e1000 +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-linux + openshift.io/display-name: Linux Guest + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: linux +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-linux + openshift.io/display-name: Linux EFI Guest + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux-efi + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: linux.efi +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} + firmware: + preferredEfi: + secureBoot: false +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-linux + openshift.io/display-name: Linux Virtio Transitional Guest + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux-virtio-transitional + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/vendor: kubevirt.io + name: linux.virtiotransitional +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} + preferredUseVirtioTransitional: true +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-opensuse-leap openshift.io/display-name: OpenSUSE Leap - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,opensuse.leap labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: opensuse.leap spec: @@ -445,12 +515,16 @@ metadata: annotations: iconClass: icon-opensuse-tumbleweed openshift.io/display-name: OpenSUSE Tumbleweed - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,opensuse.tumbleweed labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: opensuse.tumbleweed spec: @@ -470,15 +544,55 @@ apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference metadata: annotations: - iconClass: icon-rhel - openshift.io/display-name: Red Hat Enterprise Linux 10 Beta (amd64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + iconClass: icon-oracle + openshift.io/display-name: Oracle Linux + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,oraclelinux + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "2" + instancetype.kubevirt.io/required-memory: 4Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: oraclelinux +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} + firmware: + preferredEfi: + secureBoot: false + requirements: + cpu: + guest: 2 + memory: + guest: 4Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-rhel + openshift.io/display-name: Red Hat Enterprise Linux 10 (amd64) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel labels: instancetype.kubevirt.io/arch: amd64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: amd64 + instancetype.kubevirt.io/required-architecture: amd64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.10 spec: @@ -494,7 +608,9 @@ spec: firmware: preferredEfi: secureBoot: true + preferredArchitecture: amd64 requirements: + architecture: amd64 cpu: guest: 1 memory: @@ -505,14 +621,20 @@ kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-rhel - openshift.io/display-name: Red Hat Enterprise Linux 10 Beta (arm64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/display-name: Red Hat Enterprise Linux 10 (arm64) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel labels: instancetype.kubevirt.io/arch: arm64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: arm64 + instancetype.kubevirt.io/required-architecture: arm64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.10.arm64 spec: @@ -523,6 +645,141 @@ spec: preferredDiskDedicatedIoThread: true preferredInterfaceModel: virtio preferredRng: {} + preferredArchitecture: arm64 + requirements: + architecture: arm64 + cpu: + guest: 1 + memory: + guest: 1.5Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-rhel + openshift.io/display-name: Red Hat Enterprise Linux 10 (s390x) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux,rhel + labels: + instancetype.kubevirt.io/arch: s390x + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: s390x + instancetype.kubevirt.io/required-architecture: s390x + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: rhel.10.s390x +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredDiskDedicatedIoThread: true + preferredInterfaceModel: virtio + preferredRng: {} + preferredArchitecture: s390x + requirements: + architecture: s390x + cpu: + guest: 1 + memory: + guest: 1.5Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-rhel + openshift.io/display-name: Red Hat Enterprise Linux 7 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux,rhel + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: rhel.7 +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-rhel + openshift.io/display-name: Red Hat Enterprise Linux 7 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux,rhel + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: rhel.7.desktop +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + preferredRng: {} + requirements: + cpu: + guest: 1 + memory: + guest: 1Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-rhel + openshift.io/display-name: Red Hat Enterprise Linux 8 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux,rhel + labels: + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: rhel.8 +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredInterfaceModel: virtio + preferredRng: {} requirements: cpu: guest: 1 @@ -531,97 +788,20 @@ spec: --- apiVersion: instancetype.kubevirt.io/v1beta1 kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-rhel - openshift.io/display-name: Red Hat Enterprise Linux 7 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,rhel - labels: - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: rhel.7 -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredDiskBus: virtio - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-rhel - openshift.io/display-name: Red Hat Enterprise Linux 7 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,rhel - labels: - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: rhel.7.desktop -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredAutoattachInputDevice: true - preferredDiskBus: virtio - preferredInputBus: virtio - preferredInputType: tablet - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 8 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues - tags: hidden,kubevirt,linux,rhel - labels: - instancetype.kubevirt.io/os-type: linux - instancetype.kubevirt.io/vendor: kubevirt.io - name: rhel.8 -spec: - annotations: - vm.kubevirt.io/os: linux - devices: - preferredDiskBus: virtio - preferredInterfaceModel: virtio - requirements: - cpu: - guest: 1 - memory: - guest: 1.5Gi ---- -apiVersion: instancetype.kubevirt.io/v1beta1 -kind: VirtualMachineClusterPreference -metadata: - annotations: - iconClass: icon-rhel - openshift.io/display-name: Red Hat Enterprise Linux 8 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes - openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.8.desktop spec: @@ -633,6 +813,7 @@ spec: preferredInputBus: virtio preferredInputType: tablet preferredInterfaceModel: virtio + preferredRng: {} requirements: cpu: guest: 1 @@ -645,12 +826,16 @@ metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 8 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel,dpdk labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "8" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.8.dpdk spec: @@ -665,9 +850,10 @@ spec: preferredDiskBus: virtio preferredInterfaceModel: virtio preferredNetworkInterfaceMultiQueue: true + preferredRng: {} requirements: cpu: - guest: 2 + guest: 8 memory: guest: 1.5Gi --- @@ -677,13 +863,19 @@ metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 9 (amd64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel labels: instancetype.kubevirt.io/arch: amd64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: amd64 + instancetype.kubevirt.io/required-architecture: amd64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.9 spec: @@ -699,7 +891,9 @@ spec: firmware: preferredEfi: secureBoot: true + preferredArchitecture: amd64 requirements: + architecture: amd64 cpu: guest: 1 memory: @@ -711,13 +905,19 @@ metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 9 (arm64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel labels: instancetype.kubevirt.io/arch: arm64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: arm64 + instancetype.kubevirt.io/required-architecture: arm64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.9.arm64 spec: @@ -728,7 +928,9 @@ spec: preferredDiskDedicatedIoThread: true preferredInterfaceModel: virtio preferredRng: {} + preferredArchitecture: arm64 requirements: + architecture: arm64 cpu: guest: 1 memory: @@ -740,13 +942,19 @@ metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 9 Desktop (amd64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel labels: instancetype.kubevirt.io/arch: amd64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: amd64 + instancetype.kubevirt.io/required-architecture: amd64 + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.9.desktop spec: @@ -765,7 +973,9 @@ spec: firmware: preferredEfi: secureBoot: true + preferredArchitecture: amd64 requirements: + architecture: amd64 cpu: guest: 1 memory: @@ -777,13 +987,19 @@ metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 9 DPDK (amd64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel,dpdk labels: instancetype.kubevirt.io/arch: amd64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: amd64 + instancetype.kubevirt.io/required-architecture: amd64 + instancetype.kubevirt.io/required-cpu: "8" + instancetype.kubevirt.io/required-memory: 1.5Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.9.dpdk spec: @@ -805,9 +1021,11 @@ spec: firmware: preferredEfi: secureBoot: true + preferredArchitecture: amd64 requirements: + architecture: amd64 cpu: - guest: 2 + guest: 8 memory: guest: 1.5Gi --- @@ -817,13 +1035,19 @@ metadata: annotations: iconClass: icon-rhel openshift.io/display-name: Red Hat Enterprise Linux 9 Realtime (amd64) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,linux,rhel,realtime labels: instancetype.kubevirt.io/arch: amd64 instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: amd64 + instancetype.kubevirt.io/required-architecture: amd64 + instancetype.kubevirt.io/required-cpu: "4" + instancetype.kubevirt.io/required-memory: 4Gi instancetype.kubevirt.io/vendor: kubevirt.io name: rhel.9.realtime spec: @@ -847,7 +1071,46 @@ spec: firmware: preferredEfi: secureBoot: true + preferredArchitecture: amd64 requirements: + architecture: amd64 + cpu: + guest: 4 + memory: + guest: 4Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-rhel + openshift.io/display-name: Red Hat Enterprise Linux 9 (s390x) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,linux,rhel + labels: + instancetype.kubevirt.io/arch: s390x + instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/preferred-architecture: s390x + instancetype.kubevirt.io/required-architecture: s390x + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 1.5Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: rhel.9.s390x +spec: + annotations: + vm.kubevirt.io/os: linux + devices: + preferredDiskBus: virtio + preferredDiskDedicatedIoThread: true + preferredInterfaceModel: virtio + preferredRng: {} + preferredArchitecture: s390x + requirements: + architecture: s390x cpu: guest: 1 memory: @@ -859,12 +1122,16 @@ metadata: annotations: iconClass: icon-sles openshift.io/display-name: SUSE Linux Enterprise Server - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,sles labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: sles spec: @@ -886,12 +1153,16 @@ metadata: annotations: iconClass: icon-ubuntu openshift.io/display-name: Ubuntu - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,ubuntu labels: instancetype.kubevirt.io/os-type: linux + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: ubuntu spec: @@ -913,12 +1184,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows 10 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.10 spec: @@ -976,12 +1251,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows 10 (virtio) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.10.virtio spec: @@ -1041,12 +1320,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows 11 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "2" + instancetype.kubevirt.io/required-memory: 4Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.11 spec: @@ -1070,6 +1353,7 @@ spec: preferredDiskBus: sata preferredInterfaceModel: e1000e preferredTPM: + persistent: true features: preferredAcpi: {} preferredApic: {} @@ -1091,6 +1375,7 @@ spec: preferredSmm: {} firmware: preferredEfi: + persistent: true secureBoot: true preferredTerminationGracePeriodSeconds: 3600 requirements: @@ -1105,12 +1390,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows 11 (virtio) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "2" + instancetype.kubevirt.io/required-memory: 4Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.11.virtio spec: @@ -1136,6 +1425,7 @@ spec: preferredInputType: tablet preferredInterfaceModel: virtio preferredTPM: + persistent: true features: preferredAcpi: {} preferredApic: {} @@ -1157,6 +1447,7 @@ spec: preferredSmm: {} firmware: preferredEfi: + persistent: true secureBoot: true preferredTerminationGracePeriodSeconds: 3600 requirements: @@ -1170,13 +1461,145 @@ kind: VirtualMachineClusterPreference metadata: annotations: iconClass: icon-windows - openshift.io/display-name: Microsoft Windows Server 2016 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/display-name: Microsoft Windows Server 2012/2012 R2 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 512Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.2k12 +spec: + annotations: + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: sata + preferredInterfaceModel: e1000e + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows Server 2012/2012 R2 (virtio) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 512Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.2k12.virtio +spec: + annotations: + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows Server 2016 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k16 spec: @@ -1234,12 +1657,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2016 (virtio) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k16.virtio spec: @@ -1299,12 +1726,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2019 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k19 spec: @@ -1362,12 +1793,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2019 (virtio) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k19.virtio spec: @@ -1427,12 +1862,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2022 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k22 spec: @@ -1456,6 +1895,7 @@ spec: preferredDiskBus: sata preferredInterfaceModel: e1000e preferredTPM: + persistent: true features: preferredAcpi: {} preferredApic: {} @@ -1477,6 +1917,7 @@ spec: preferredSmm: {} firmware: preferredEfi: + persistent: true secureBoot: true preferredTerminationGracePeriodSeconds: 3600 requirements: @@ -1491,12 +1932,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2022 (virtio) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k22.virtio spec: @@ -1522,6 +1967,7 @@ spec: preferredInputType: tablet preferredInterfaceModel: virtio preferredTPM: + persistent: true features: preferredAcpi: {} preferredApic: {} @@ -1543,6 +1989,7 @@ spec: preferredSmm: {} firmware: preferredEfi: + persistent: true secureBoot: true preferredTerminationGracePeriodSeconds: 3600 requirements: @@ -1557,12 +2004,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2025 - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k25 spec: @@ -1586,6 +2037,7 @@ spec: preferredDiskBus: sata preferredInterfaceModel: e1000e preferredTPM: + persistent: true features: preferredAcpi: {} preferredApic: {} @@ -1607,6 +2059,7 @@ spec: preferredSmm: {} firmware: preferredEfi: + persistent: true secureBoot: true preferredTerminationGracePeriodSeconds: 3600 requirements: @@ -1621,12 +2074,16 @@ metadata: annotations: iconClass: icon-windows openshift.io/display-name: Microsoft Windows Server 2025 (virtio) - openshift.io/documentation-url: https://github.com/kubevirt/common-instancetypes + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" openshift.io/provider-display-name: KubeVirt - openshift.io/support-url: https://github.com/kubevirt/common-instancetypes/issues + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" tags: hidden,kubevirt,windows labels: instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi instancetype.kubevirt.io/vendor: kubevirt.io name: windows.2k25.virtio spec: @@ -1652,6 +2109,7 @@ spec: preferredInputType: tablet preferredInterfaceModel: virtio preferredTPM: + persistent: true features: preferredAcpi: {} preferredApic: {} @@ -1673,6 +2131,7 @@ spec: preferredSmm: {} firmware: preferredEfi: + persistent: true secureBoot: true preferredTerminationGracePeriodSeconds: 3600 requirements: @@ -1680,3 +2139,387 @@ spec: guest: 1 memory: guest: 2Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows Server 2003 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 256Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.2k3 +spec: + annotations: + kubevirt.io/disablePCIHole64: "true" + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: sata + preferredInterfaceModel: rtl8139 + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 256Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows Server 2008/2008 R2 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 512Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.2k8 +spec: + annotations: + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: sata + preferredInterfaceModel: e1000 + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows Server 2008/2008 R2 (virtio) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 512Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.2k8.virtio +spec: + annotations: + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 512Mi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows 7 + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.7 +spec: + annotations: + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: sata + preferredInterfaceModel: e1000e + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows 7 (virtio) + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 2Gi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.7.virtio +spec: + annotations: + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: virtio + preferredInputBus: virtio + preferredInputType: tablet + preferredInterfaceModel: virtio + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 2Gi +--- +apiVersion: instancetype.kubevirt.io/v1beta1 +kind: VirtualMachineClusterPreference +metadata: + annotations: + iconClass: icon-windows + openshift.io/display-name: Microsoft Windows XP + openshift.io/documentation-url: | + "https://github.com/kubevirt/common-instancetypes" + openshift.io/provider-display-name: KubeVirt + openshift.io/support-url: | + "https://github.com/kubevirt/common-instancetypes/issues" + tags: hidden,kubevirt,windows + labels: + instancetype.kubevirt.io/os-type: windows + instancetype.kubevirt.io/required-cpu: "1" + instancetype.kubevirt.io/required-memory: 128Mi + instancetype.kubevirt.io/vendor: kubevirt.io + name: windows.xp +spec: + annotations: + kubevirt.io/disablePCIHole64: "true" + vm.kubevirt.io/os: windows + clock: + preferredClockOffset: + utc: {} + preferredTimer: + hpet: + present: false + hyperv: {} + pit: + tickPolicy: delay + rtc: + tickPolicy: catchup + cpu: + preferredCPUTopology: sockets + devices: + preferredAutoattachInputDevice: true + preferredDiskBus: sata + preferredInterfaceModel: e1000e + features: + preferredAcpi: {} + preferredApic: {} + preferredHyperv: + frequencies: {} + ipi: {} + reenlightenment: {} + relaxed: {} + reset: {} + runtime: {} + spinlocks: + spinlocks: 8191 + synic: {} + synictimer: + direct: {} + tlbflush: {} + vapic: {} + vpindex: {} + preferredTerminationGracePeriodSeconds: 3600 + requirements: + cpu: + guest: 1 + memory: + guest: 128Mi diff --git a/packages/system/seaweedfs-db/Chart.yaml b/packages/system/seaweedfs-db/Chart.yaml new file mode 100644 index 000000000..0b0dbbe79 --- /dev/null +++ b/packages/system/seaweedfs-db/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v2 +name: cozy-seaweedfs-db +version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process diff --git a/packages/system/seaweedfs-db/Makefile b/packages/system/seaweedfs-db/Makefile new file mode 100644 index 000000000..0456f28d6 --- /dev/null +++ b/packages/system/seaweedfs-db/Makefile @@ -0,0 +1,7 @@ +export NAME=seaweedfs-db + +include ../../../hack/common-envs.mk +include ../../../hack/package.mk + +test: + helm unittest . diff --git a/packages/system/seaweedfs-db/README.md b/packages/system/seaweedfs-db/README.md new file mode 100644 index 000000000..70566913a --- /dev/null +++ b/packages/system/seaweedfs-db/README.md @@ -0,0 +1,14 @@ +# SeaweedFS Database + +## Parameters + +### Database parameters + +| Name | Description | Type | Value | +| ----------------- | ----------------------------------------------------------------------------- | ---------- | ------------------------------------------------------------------------------------- | +| `db` | Database configuration. | `object` | `{}` | +| `db.replicas` | Number of database replicas. | `int` | `2` | +| `db.size` | Persistent Volume size. | `quantity` | `10Gi` | +| `db.storageClass` | StorageClass used to store the data. | `string` | `""` | +| `db.resources` | Kubernetes resource requests and limits, passed verbatim to the CNPG Cluster. | `object` | `{"limits":{"cpu":"1","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"512Mi"}}` | + diff --git a/packages/system/seaweedfs/templates/database.yaml b/packages/system/seaweedfs-db/templates/database.yaml similarity index 89% rename from packages/system/seaweedfs/templates/database.yaml rename to packages/system/seaweedfs-db/templates/database.yaml index b9b50c49e..807bd13af 100644 --- a/packages/system/seaweedfs/templates/database.yaml +++ b/packages/system/seaweedfs-db/templates/database.yaml @@ -17,12 +17,7 @@ spec: monitoring: enablePodMonitor: true resources: - limits: - cpu: "1" - memory: 2048Mi - requests: - cpu: 100m - memory: 512Mi + {{- toYaml .Values.db.resources | nindent 4 }} inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" diff --git a/packages/system/seaweedfs-db/tests/database_test.yaml b/packages/system/seaweedfs-db/tests/database_test.yaml new file mode 100644 index 000000000..3eff5a112 --- /dev/null +++ b/packages/system/seaweedfs-db/tests/database_test.yaml @@ -0,0 +1,62 @@ +suite: seaweedfs-db CNPG Cluster + +# Baseline render cover for the chart introduced by the seaweedfs split. The +# split moved the filer metadata Cluster into its own release; this pins the +# shape (instances from db.replicas, configurable storage, the fresh-install +# image default, and the apiserver-allow label) so a regression in the new +# chart is caught before it reaches a tenant's metadata database. + +templates: + - templates/database.yaml + +tests: + - it: renders a CNPG Cluster named seaweedfs-db + release: + name: seaweedfs-db + namespace: cozy-seaweedfs + asserts: + - hasDocuments: + count: 1 + - isKind: + of: Cluster + - equal: + path: metadata.name + value: seaweedfs-db + + - it: instances and storage follow db values + release: + name: seaweedfs-db + namespace: cozy-seaweedfs + set: + db: + replicas: 3 + size: 25Gi + storageClass: replicated + asserts: + - equal: + path: spec.instances + value: 3 + - equal: + path: spec.storage.size + value: 25Gi + - equal: + path: spec.storage.storageClass + value: replicated + + - it: fresh install pins the default postgres 17.7 image + release: + name: seaweedfs-db + namespace: cozy-seaweedfs + asserts: + - equal: + path: spec.imageName + value: ghcr.io/cloudnative-pg/postgresql:17.7-standard-trixie + + - it: carries the apiserver-allow inherited label + release: + name: seaweedfs-db + namespace: cozy-seaweedfs + asserts: + - equal: + path: spec.inheritedMetadata.labels["policy.cozystack.io/allow-to-apiserver"] + value: "true" diff --git a/packages/system/seaweedfs-db/values.schema.json b/packages/system/seaweedfs-db/values.schema.json new file mode 100644 index 000000000..5cc1dea8d --- /dev/null +++ b/packages/system/seaweedfs-db/values.schema.json @@ -0,0 +1,52 @@ +{ + "title": "Chart Values", + "type": "object", + "properties": { + "db": { + "description": "Database configuration.", + "type": "object", + "default": {}, + "properties": { + "replicas": { + "description": "Number of database replicas.", + "type": "integer", + "default": 2 + }, + "resources": { + "description": "Kubernetes resource requests and limits, passed verbatim to the CNPG Cluster.", + "type": "object", + "default": { + "limits": { + "cpu": "1", + "memory": "2048Mi" + }, + "requests": { + "cpu": "100m", + "memory": "512Mi" + } + }, + "x-kubernetes-preserve-unknown-fields": true + }, + "size": { + "description": "Persistent Volume size.", + "default": "10Gi", + "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$", + "anyOf": [ + { + "type": "integer" + }, + { + "type": "string" + } + ], + "x-kubernetes-int-or-string": true + }, + "storageClass": { + "description": "StorageClass used to store the data.", + "type": "string", + "default": "" + } + } + } + } +} diff --git a/packages/system/seaweedfs-db/values.yaml b/packages/system/seaweedfs-db/values.yaml new file mode 100644 index 000000000..3a610065b --- /dev/null +++ b/packages/system/seaweedfs-db/values.yaml @@ -0,0 +1,22 @@ +## +## @section Database parameters +## + +## @typedef {struct} DB - Database configuration. +## @field {int} [replicas] - Number of database replicas. +## @field {quantity} [size] - Persistent Volume size. +## @field {string} [storageClass] - StorageClass used to store the data. +## @field {object} [resources] - Kubernetes resource requests and limits, passed verbatim to the CNPG Cluster. + +## @param {DB} db - Database configuration. +db: + replicas: 2 + size: 10Gi + storageClass: "" + resources: + limits: + cpu: "1" + memory: 2048Mi + requests: + cpu: 100m + memory: 512Mi diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 8f9920a97..f7a6ac7e7 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -188,7 +188,3 @@ seaweedfs: keySize: 2048 duration: 87600h # 10 years renewBefore: 720h # 30d -db: - replicas: 2 - size: 10Gi - storageClass: "" diff --git a/packages/system/tenant-rd/cozyrds/tenant.yaml b/packages/system/tenant-rd/cozyrds/tenant.yaml index 5fd6643b8..e6532ef79 100644 --- a/packages/system/tenant-rd/cozyrds/tenant.yaml +++ b/packages/system/tenant-rd/cozyrds/tenant.yaml @@ -2,6 +2,19 @@ apiVersion: cozystack.io/v1alpha1 kind: ApplicationDefinition metadata: name: tenant + annotations: + # Tenant charts install a serial chain of child HelmReleases (seaweedfs, + # monitoring, etcd, ingress). The seaweedfs subtree alone is now + # seaweedfs-db -> seaweedfs-system -> seaweedfs (~5 min wall-clock for + # CNPG bootstrap + master quorum). Flux helm-controller's default 5m + # wait budget on the parent tenant HR fires before children reach Ready, + # which rolls back the children and starts an oscillation loop. This + # override is applied by cozystack-api to the HelmRelease + # Spec.Install.Timeout and Spec.Upgrade.Timeout for sub-tenants. + # tenant-root uses a static HR defined in + # packages/system/cozystack-basics/templates/tenant-root.yaml; its + # timeout is set there directly. Keep the two values aligned. + release.cozystack.io/helm-install-timeout: "15m" spec: application: kind: Tenant diff --git a/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml b/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml index 2df053b55..73df18b0d 100644 --- a/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml +++ b/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml @@ -20,9 +20,14 @@ spec: kind: ExternalArtifact name: cozystack-vertical-pod-autoscaler-default-vpa-for-vpa namespace: cozy-system - dependsOn: - - name: monitoring-agents - namespace: cozy-monitoring + # Do NOT add dependsOn: monitoring-agents — it creates a circular wait: + # helm install of the parent vertical-pod-autoscaler HR waits for this nested + # HR's Ready condition; this HR waits for monitoring-agents; monitoring-agents + # PackageSource waits for cozystack.vertical-pod-autoscaler Ready; that waits + # for the parent HR. The recommender's /health-check probe is served by the + # binary itself and doesn't require Prometheus, so the pod becomes Ready + # immediately and starts producing recommendations when monitoring-agents + # finishes installing later. install: crds: Skip remediation: diff --git a/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml b/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml index e56bd9dd8..0988be411 100644 --- a/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml +++ b/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml @@ -8,7 +8,7 @@ spec: singular: vminstance plural: vminstances openAPISchema: |- - {"title":"Chart Values","type":"object","properties":{"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"externalMethod":{"description":"Method to pass through traffic to the VM.","type":"string","default":"PortList","enum":["PortList","WholeIP"]},"externalPorts":{"description":"Ports to forward from outside the cluster.","type":"array","default":[22],"items":{"type":"integer"}},"externalAllowICMP":{"description":"Whether to accept ICMP traffic to the VM in PortList mode (preserves ping and PMTU discovery). No effect in WholeIP mode. Default true so ping behaves as users expect even when port filtering is in effect.","type":"boolean","default":true},"runStrategy":{"description":"Requested running state of the VirtualMachineInstance","type":"string","default":"Always","enum":["Always","Halted","Manual","RerunOnFailure","Once"]},"instanceType":{"description":"Virtual Machine instance type.","type":"string","default":"u1.medium"},"instanceProfile":{"description":"Virtual Machine preferences profile.","type":"string","default":"ubuntu","enum":["alpine","centos.7","centos.7.desktop","centos.stream10","centos.stream10.desktop","centos.stream8","centos.stream8.desktop","centos.stream8.dpdk","centos.stream9","centos.stream9.desktop","centos.stream9.dpdk","cirros","fedora","fedora.arm64","opensuse.leap","opensuse.tumbleweed","rhel.10","rhel.10.arm64","rhel.7","rhel.7.desktop","rhel.8","rhel.8.desktop","rhel.8.dpdk","rhel.9","rhel.9.arm64","rhel.9.desktop","rhel.9.dpdk","rhel.9.realtime","sles","ubuntu","windows.10","windows.10.virtio","windows.11","windows.11.virtio","windows.2k16","windows.2k16.virtio","windows.2k19","windows.2k19.virtio","windows.2k22","windows.2k22.virtio","windows.2k25","windows.2k25.virtio",""]},"disks":{"description":"List of disks to attach.","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"bus":{"description":"Disk bus type (e.g. \"sata\").","type":"string"},"name":{"description":"Disk name.","type":"string"}}}},"networks":{"description":"Networks to attach the VM to.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string"}}}},"subnets":{"description":"Deprecated: use networks instead.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string"}}}},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"name":{"description":"The name of the GPU resource to attach.","type":"string"}}}},"cpuModel":{"description":"Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map","type":"string","default":""},"resources":{"description":"Resource configuration for the virtual machine.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"sockets":{"description":"Number of CPU sockets (vCPU topology).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"sshKeys":{"description":"List of SSH public keys for authentication.","type":"array","default":[],"items":{"type":"string"}},"cloudInit":{"description":"Cloud-init user data.","type":"string","default":""},"cloudInitSeed":{"description":"Seed string to generate SMBIOS UUID for the VM.","type":"string","default":""}}} + {"title":"Chart Values","type":"object","properties":{"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"externalMethod":{"description":"Method to pass through traffic to the VM.","type":"string","default":"PortList","enum":["PortList","WholeIP"]},"externalPorts":{"description":"Ports to forward from outside the cluster.","type":"array","default":[22],"items":{"type":"integer"}},"externalAllowICMP":{"description":"Whether to accept ICMP traffic to the VM in PortList mode (preserves ping and PMTU discovery). No effect in WholeIP mode. Default true so ping behaves as users expect even when port filtering is in effect.","type":"boolean","default":true},"runStrategy":{"description":"Requested running state of the VirtualMachineInstance","type":"string","default":"Always","enum":["Always","Halted","Manual","RerunOnFailure","Once"]},"instanceType":{"description":"Virtual Machine instance type.","type":"string","default":"u1.medium"},"instanceProfile":{"description":"Virtual Machine preferences profile.","type":"string","default":"ubuntu","enum":["alpine","centos.7","centos.7.desktop","centos.stream10","centos.stream10.desktop","centos.stream8","centos.stream8.desktop","centos.stream8.dpdk","centos.stream9","centos.stream9.desktop","centos.stream9.dpdk","cirros","debian","fedora","fedora.arm64","fedora.s390x","legacy","linux","linux.efi","linux.virtiotransitional","opensuse.leap","opensuse.tumbleweed","oraclelinux","rhel.10","rhel.10.arm64","rhel.10.s390x","rhel.7","rhel.7.desktop","rhel.8","rhel.8.desktop","rhel.8.dpdk","rhel.9","rhel.9.arm64","rhel.9.desktop","rhel.9.dpdk","rhel.9.realtime","rhel.9.s390x","sles","ubuntu","windows.10","windows.10.virtio","windows.11","windows.11.virtio","windows.2k12","windows.2k12.virtio","windows.2k16","windows.2k16.virtio","windows.2k19","windows.2k19.virtio","windows.2k22","windows.2k22.virtio","windows.2k25","windows.2k25.virtio","windows.2k3","windows.2k8","windows.2k8.virtio","windows.7","windows.7.virtio","windows.xp",""]},"disks":{"description":"List of disks to attach.","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"bus":{"description":"Disk bus type (e.g. \"sata\").","type":"string"},"name":{"description":"Disk name.","type":"string"}}}},"networks":{"description":"Networks to attach the VM to.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string"}}}},"subnets":{"description":"Deprecated: use networks instead.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string"}}}},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"name":{"description":"The name of the GPU resource to attach.","type":"string"}}}},"cpuModel":{"description":"Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map","type":"string","default":""},"resources":{"description":"Resource configuration for the virtual machine.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"sockets":{"description":"Number of CPU sockets (vCPU topology).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"sshKeys":{"description":"List of SSH public keys for authentication.","type":"array","default":[],"items":{"type":"string"}},"cloudInit":{"description":"Cloud-init user data.","type":"string","default":""},"cloudInitSeed":{"description":"Seed string to generate SMBIOS UUID for the VM.","type":"string","default":""}}} release: prefix: vm-instance- labels: diff --git a/pkg/registry/apps/application/rest.go b/pkg/registry/apps/application/rest.go index e67653c28..9770ef0fa 100644 --- a/pkg/registry/apps/application/rest.go +++ b/pkg/registry/apps/application/rest.go @@ -1581,12 +1581,14 @@ func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (* // Upgrade.Timeout populated from ReleaseConfig.HelmInstallTimeout // (parsed at startup). Applications that leave it unset keep flux // defaults so their failed installs remediate on the normal cadence. - // Today only kubernetes-rd carries the annotation because the + // kubernetes-rd and tenant-rd carry the annotation today: the // Kubernetes Application's parent chart contains CAPI/Kamaji // resources whose admin-kubeconfig Secret is provisioned // asynchronously and Kamaji cold-start routinely exceeds flux's - // default wait budget; any future kind with the same shape can opt - // in by setting the same annotation. + // default wait budget, and the Tenant parent chart bootstraps the + // seaweedfs-db CNPG cluster whose first reconcile exceeds it too. + // Any future kind with the same shape can opt in by setting the + // same annotation. if r.releaseConfig.HelmInstallTimeout > 0 { timeout := metav1.Duration{Duration: r.releaseConfig.HelmInstallTimeout} helmRelease.Spec.Install.Timeout = &timeout