Skip to content

Commit c3c4afa

Browse files
authored
Merge branch 'main' into optional-components
2 parents af89693 + 31a45c4 commit c3c4afa

13 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎manifests/cozystack-installer.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
serviceAccountName: cozystack
6969
containers:
7070
- name: cozystack
71-
image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.1"
71+
image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.2"
7272
env:
7373
- name: KUBERNETES_SERVICE_HOST
7474
value: localhost
@@ -87,7 +87,7 @@ spec:
8787
fieldRef:
8888
fieldPath: metadata.name
8989
- name: darkhttpd
90-
image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.1"
90+
image: "ghcr.io/aenix-io/cozystack/cozystack:v0.16.2"
9191
command:
9292
- /usr/bin/darkhttpd
9393
- /cozystack/assets

‎packages/apps/kubernetes/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.11.1
19+
version: 0.12.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/aenix-io/cozystack/cluster-autoscaler:0.11.0@sha256:7f617de5a24de790a15d9e97c6287ff2b390922e6e74c7a665cbf498f634514d
1+
ghcr.io/aenix-io/cozystack/cluster-autoscaler:0.11.1@sha256:7f617de5a24de790a15d9e97c6287ff2b390922e6e74c7a665cbf498f634514d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/aenix-io/cozystack/kubevirt-cloud-provider:0.11.0@sha256:91e6843afa704ba7c513842bc3a612f2c0b295ce95aebe60fbb6be09709a1947
1+
ghcr.io/aenix-io/cozystack/kubevirt-cloud-provider:0.11.1@sha256:b5aa62a53be566b49dea635ce8f6b9280566e260f8493ff3d71f8c7501fb4cbc
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/aenix-io/cozystack/kubevirt-csi-driver:0.11.0@sha256:1a9e6592fc035dbaae27f308b934206858c2e0025d4c99cd906b51615cc9766c
1+
ghcr.io/aenix-io/cozystack/kubevirt-csi-driver:0.11.1@sha256:705e20e638315501aaa8b8156ceb8b260086b21876aa994bec9d6c406955c6d4

‎packages/apps/kubernetes/images/kubevirt-csi-driver/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG builder_image=docker.io/library/golang:1.22.5
33
FROM ${builder_image} AS builder
44
RUN git clone https://github.com/kubevirt/csi-driver /src/kubevirt-csi-driver \
55
&& cd /src/kubevirt-csi-driver \
6-
&& git checkout 35836e0c8b68d9916d29a838ea60cdd3fc6199cf
6+
&& git checkout fa92820448e583c7fd722dc20270544e0c3eca53
77

88
WORKDIR /src/kubevirt-csi-driver
99
RUN make build

‎packages/apps/kubernetes/templates/cluster.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,26 @@ spec:
210210
name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
211211
namespace: default
212212
version: v1.30.1
213+
---
214+
apiVersion: cluster.x-k8s.io/v1beta1
215+
kind: MachineHealthCheck
216+
metadata:
217+
name: {{ $.Release.Name }}-{{ $groupName }}
218+
namespace: {{ $.Release.Namespace }}
219+
spec:
220+
clusterName: {{ $.Release.Name }}
221+
nodeStartupTimeout: 10m
222+
selector:
223+
matchLabels:
224+
cluster.x-k8s.io/cluster-name: {{ $.Release.Name }}
225+
cluster.x-k8s.io/deployment-name: {{ $.Release.Name }}-{{ $groupName }}
226+
unhealthyConditions:
227+
- type: Ready
228+
status: Unknown
229+
timeout: 30s
230+
- type: Ready
231+
status: "False"
232+
timeout: 30s
213233
{{- end }}
214234
---
215235
{{- /*

‎packages/apps/versions_map‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ kubernetes 0.8.1 e54608d8
3232
kubernetes 0.8.2 5ca8823
3333
kubernetes 0.9.0 9b6dd19
3434
kubernetes 0.10.0 ac5c38b
35-
kubernetes 0.11.0 HEAD
35+
kubernetes 0.11.0 4eaca42
36+
kubernetes 0.11.1 4f430a90
37+
kubernetes 0.12.0 HEAD
3638
mysql 0.1.0 f642698
3739
mysql 0.2.0 8b975ff0
3840
mysql 0.3.0 5ca8823
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
cozystack:
2-
image: ghcr.io/aenix-io/cozystack/cozystack:v0.16.1@sha256:f27695d23d449f10888295bd2ba6c084c8fa4b81f109d4836ec9db528b943b62
2+
image: ghcr.io/aenix-io/cozystack/cozystack:v0.16.2@sha256:0ee9d03a0453f19cc8deabf9ee4b9c6d9cc61e4ba833546a62a2f6b2265868f3

‎packages/core/testing/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
e2e:
2-
image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.16.1@sha256:25b298d621ec79431d106184d59849bbae634588742583d111628126ad8615c5
2+
image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.16.2@sha256:25b298d621ec79431d106184d59849bbae634588742583d111628126ad8615c5

0 commit comments

Comments
 (0)