diff --git a/Makefile b/Makefile index e2a449c7..7c8f4f83 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ build: make -C packages/system/kubeovn image make -C packages/system/dashboard image make -C packages/system/kamaji image + make -C packages/core/testing image make -C packages/core/installer image - make -C packages/core/e2e image make manifests manifests: @@ -31,4 +31,4 @@ assets: test: make -C packages/core/testing apply make -C packages/core/testing test - make -C packages/cort/testing delete + make -C packages/core/testing delete diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index 681aae36..ed7c01a2 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0@sha256:73d8a2a3024cc523ff552ac94826ee57bc2795f81412eb46b432bd6003d0930f +ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0@sha256:556bc8d29ee9e90b3d64d0481dcfc66483d055803315bba3d9ece17c0d97f32b diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.tag b/packages/apps/kubernetes/images/ubuntu-container-disk.tag index f664f580..64d015f6 100644 --- a/packages/apps/kubernetes/images/ubuntu-container-disk.tag +++ b/packages/apps/kubernetes/images/ubuntu-container-disk.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1@sha256:00bcac18e2a342ab16a767e2f43827fa9f3b34bd6694e65b737b18e5a8ed93c2 +ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1@sha256:5ce80a453073c4f44347409133fc7b15f1d2f37a564d189871a4082fc552ff0f diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 390a6cdd..7ae88fdf 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -1,16 +1,20 @@ bucket 0.1.0 HEAD clickhouse 0.1.0 ca79f72 clickhouse 0.2.0 7cd7de73 -clickhouse 0.2.1 HEAD +clickhouse 0.2.1 5ca8823 +clickhouse 0.3.0 HEAD ferretdb 0.1.0 4ffa8615 -ferretdb 0.1.1 HEAD +ferretdb 0.1.1 5ca8823 +ferretdb 0.2.0 HEAD http-cache 0.1.0 a956713 -http-cache 0.2.0 HEAD +http-cache 0.2.0 5ca8823 +http-cache 0.3.0 HEAD kafka 0.1.0 760f86d2 kafka 0.2.0 a2cc83d kafka 0.2.1 3ac17018 kafka 0.2.2 d0758692 -kafka 0.2.3 HEAD +kafka 0.2.3 5ca8823 +kafka 0.3.0 HEAD kubernetes 0.1.0 f642698 kubernetes 0.2.0 7cd7de73 kubernetes 0.3.0 7caccec1 @@ -20,21 +24,27 @@ kubernetes 0.6.0 4cbc8a2c kubernetes 0.7.0 ceefae03 kubernetes 0.8.0 ac11056e kubernetes 0.8.1 e54608d8 -kubernetes 0.8.2 HEAD +kubernetes 0.8.2 5ca8823 +kubernetes 0.9.0 HEAD mysql 0.1.0 f642698 mysql 0.2.0 8b975ff0 -mysql 0.3.0 HEAD -nats 0.1.0 HEAD +mysql 0.3.0 5ca8823 +mysql 0.4.0 HEAD +nats 0.1.0 5ca8823 +nats 0.2.0 HEAD postgres 0.1.0 f642698 postgres 0.2.0 7cd7de73 postgres 0.2.1 4a97e297 postgres 0.3.0 995dea6f postgres 0.4.0 ec283c33 -postgres 0.4.1 HEAD +postgres 0.4.1 5ca8823 +postgres 0.5.0 HEAD rabbitmq 0.1.0 f642698 -rabbitmq 0.2.0 HEAD +rabbitmq 0.2.0 5ca8823 +rabbitmq 0.3.0 HEAD redis 0.1.1 f642698 -redis 0.2.0 HEAD +redis 0.2.0 5ca8823 +redis 0.3.0 HEAD tcp-balancer 0.1.0 f642698 tcp-balancer 0.2.0 HEAD tenant 0.1.3 3d1b86c @@ -48,6 +58,8 @@ tenant 1.3.1 c56e5769 tenant 1.4.0 HEAD virtual-machine 0.1.4 f2015d6 virtual-machine 0.1.5 7cd7de7 -virtual-machine 0.2.0 HEAD +virtual-machine 0.2.0 5ca8823 +virtual-machine 0.3.0 HEAD vpn 0.1.0 f642698 -vpn 0.2.0 HEAD +vpn 0.2.0 7151424 +vpn 0.3.0 HEAD diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 30fb2e57..fae7f9ad 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/aenix-io/cozystack/cozystack:v0.11.0@sha256:e8ce3a6655b548b803f6de0b837abe25afc25989a4e0d12f0b8a8ba0f0c4e290 + image: ghcr.io/aenix-io/cozystack/cozystack:v0.12.0@sha256:0917812850fd0359d5ba78fd819c0e4ce6d7c12eed9cd46813e7284064b71d30 diff --git a/packages/core/testing/Makefile b/packages/core/testing/Makefile index b0ba2964..7e6ae50e 100644 --- a/packages/core/testing/Makefile +++ b/packages/core/testing/Makefile @@ -30,10 +30,9 @@ image-e2e-sandbox: --load=$(LOAD) IMAGE="$(REGISTRY)/e2e-sandbox:$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/e2e-sandbox.json -o json -r)" \ yq -i '.e2e.image = strenv(IMAGE)' values.yaml + rm -f images/e2e-sandbox.json -test: ## Run the end-to-end tests in existing sandbox. - kubectl wait deploy --for=condition=Progressing -n $(NAMESPACE) cozystack-e2e-$(NAME) - sleep 3 +test: wait-for-sandbox ## Run the end-to-end tests in existing sandbox. cat ../../../hack/e2e.sh | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'cat > /e2e.sh && chmod +x /e2e.sh' helm template -n cozy-system installer ../installer | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'cat > /cozystack-installer.yaml' kubectl exec -ti -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'export COZYSTACK_INSTALLER_YAML=$$(cat /cozystack-installer.yaml) && /e2e.sh' @@ -52,3 +51,7 @@ login: ## Downloads the kubeconfig into a temporary directory and runs a shell w sync-hosts: kubectl exec -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'kubectl get ing -A -o go-template='\''{{ "127.0.0.1 localhost\n"}}{{ range .items }}{{ range .status.loadBalancer.ingress }}{{ .ip }}{{ end }} {{ range .spec.rules }}{{ .host }}{{ end }}{{ "\n" }}{{ end }}'\'' > /etc/hosts' + +wait-for-sandbox: + kubectl wait deploy --for=condition=Progressing -n $(NAMESPACE) cozystack-e2e-$(NAME) + kubectl wait pod --for=condition=Ready -n $(NAMESPACE) -l app=cozystack-e2e-$(NAME) diff --git a/packages/core/testing/images/e2e-sandbox.json b/packages/core/testing/images/e2e-sandbox.json deleted file mode 100644 index 647d660b..00000000 --- a/packages/core/testing/images/e2e-sandbox.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "buildx.build.ref": "buildkit/buildkit0/yej19zqlualmgypt6eig19jvv", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json", - "digest": "sha256:be1693c8ce6a9522499f79b1e42b2e08c7ca80405026a095299e5e990a3ab791", - "size": 685 - }, - "containerimage.digest": "sha256:be1693c8ce6a9522499f79b1e42b2e08c7ca80405026a095299e5e990a3ab791", - "image.name": "ghcr.io/aenix-io/cozystack/e2e-sandbox:latest" -} \ No newline at end of file diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 10e5edef..e9024c34 100644 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/aenix-io/cozystack/e2e-sandbox:latest@sha256:be1693c8ce6a9522499f79b1e42b2e08c7ca80405026a095299e5e990a3ab791 + image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.12.0@sha256:be1693c8ce6a9522499f79b1e42b2e08c7ca80405026a095299e5e990a3ab791 diff --git a/packages/extra/monitoring/Chart.yaml b/packages/extra/monitoring/Chart.yaml index 3bd1c4e0..7c35e0c9 100644 --- a/packages/extra/monitoring/Chart.yaml +++ b/packages/extra/monitoring/Chart.yaml @@ -3,4 +3,4 @@ name: monitoring description: Monitoring and observability stack icon: /logos/monitoring.svg type: application -version: 1.2.2 +version: 1.3.0 diff --git a/packages/extra/versions_map b/packages/extra/versions_map index 2a3f8a33..d33033a2 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -2,12 +2,15 @@ etcd 1.0.0 f7eaab0 etcd 2.0.0 a6d0f7cf etcd 2.0.1 6fc1cc7d etcd 2.1.0 2b00fcf8 -etcd 2.2.0 HEAD +etcd 2.2.0 5ca8823 +etcd 2.3.0 HEAD ingress 1.0.0 f642698 ingress 1.1.0 838bee5d ingress 1.2.0 HEAD monitoring 1.0.0 f642698 monitoring 1.1.0 15478a88 monitoring 1.2.0 c9e0d63b -monitoring 1.2.1 HEAD -seaweedfs 0.1.0 HEAD +monitoring 1.2.1 4471b4ba +monitoring 1.3.0 HEAD +seaweedfs 0.1.0 5ca8823 +seaweedfs 0.2.0 HEAD diff --git a/packages/system/cilium/values.yaml b/packages/system/cilium/values.yaml index 5f8d8008..c6199303 100644 --- a/packages/system/cilium/values.yaml +++ b/packages/system/cilium/values.yaml @@ -33,7 +33,7 @@ cilium: value: "true" image: repository: ghcr.io/aenix-io/cozystack/cilium - tag: latest + tag: 1.16.1 digest: "sha256:9593dbc3bd25487b52d8f43330d4a308e450605479a8384a32117e9613289892" envoy: enabled: false diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index b52d8e32..78f2f7dc 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -33,11 +33,11 @@ kubeapps: image: registry: ghcr.io/aenix-io/cozystack repository: dashboard - tag: v0.11.0 - digest: sha256:0500f323d31d7f953e5e5e3ddf6001ec02feb5253f035f5a30ab21680a3886ed + tag: v0.12.0 + digest: sha256:4818712e9fc9c57cc321512760c3226af564a04e69d4b3ec9229ab91fd39abeb kubeappsapis: image: registry: ghcr.io/aenix-io/cozystack repository: kubeapps-apis - tag: v0.11.0 - digest: "" + tag: v0.12.0 + digest: "sha256:5eee4c2207f23a6d5317c08bbedfd71b8b22f733b834cd370f1313fb428a22d0" diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index 280ec552..b42fc4e2 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,5 +3,5 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.11.0@sha256:34a5758a02b5d3e8fc33cad672e849f3bfcc149672893ad4584bc716245332af + tag: v0.12.0@sha256:197d7c36f76d4d9c09cc82eb87f9e36f05799a2b9158ae27e4729f2dd636ad0d repository: ghcr.io/aenix-io/cozystack/kamaji diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index 780fdf68..cf143727 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -22,4 +22,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.0@sha256:f26d060fbd17e21eabab32927dcd99c16bdc3337d5ec6942f36c5791c1bbfde7 + tag: v1.13.0@sha256:55b3ed5d4b628216378040e445aadc3d1cd817ff4d17eb081d884c6e00fb51e2