From ec150c8b573d857a9a4a473fd499685fa106b613 Mon Sep 17 00:00:00 2001 From: Marian Koreniuk Date: Thu, 8 Aug 2024 22:24:13 +0100 Subject: [PATCH] resolve conflicts --- .../apps/http-cache/images/nginx-cache.json | 48 ---------------- packages/apps/http-cache/images/nginx.json | 4 -- packages/apps/kubernetes/Chart.yaml | 2 +- .../images/ubuntu-container-disk.json | 48 ---------------- .../apps/kubernetes/templates/cluster.yaml | 2 +- .../apps/kubernetes/templates/ingress.yaml | 18 +++--- packages/core/installer/images/cozystack.json | 10 ---- packages/core/installer/images/cozystack.tag | 1 - packages/core/installer/images/matchbox.json | 45 --------------- packages/core/installer/images/matchbox.tag | 1 - .../system/dashboard/images/dashboard.json | 51 ----------------- .../system/dashboard/images/dashboard.tag | 1 - .../dashboard/images/kubeapps-apis.json | 57 ------------------- .../system/dashboard/images/kubeapps-apis.tag | 1 - packages/system/kubeovn/images/kubeovn.json | 51 ----------------- 15 files changed, 10 insertions(+), 330 deletions(-) delete mode 100644 packages/apps/http-cache/images/nginx-cache.json delete mode 100644 packages/apps/http-cache/images/nginx.json delete mode 100644 packages/apps/kubernetes/images/ubuntu-container-disk.json delete mode 100644 packages/core/installer/images/cozystack.json delete mode 100644 packages/core/installer/images/cozystack.tag delete mode 100644 packages/core/installer/images/matchbox.json delete mode 100644 packages/core/installer/images/matchbox.tag delete mode 100644 packages/system/dashboard/images/dashboard.json delete mode 100644 packages/system/dashboard/images/dashboard.tag delete mode 100644 packages/system/dashboard/images/kubeapps-apis.json delete mode 100644 packages/system/dashboard/images/kubeapps-apis.tag delete mode 100644 packages/system/kubeovn/images/kubeovn.json diff --git a/packages/apps/http-cache/images/nginx-cache.json b/packages/apps/http-cache/images/nginx-cache.json deleted file mode 100644 index 11b058c6..00000000 --- a/packages/apps/http-cache/images/nginx-cache.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "buildx.build.provenance": { - "buildType": "https://mobyproject.org/buildkit@v1", - "materials": [ - { - "uri": "pkg:docker/ubuntu@22.04?platform=linux%2Famd64", - "digest": { - "sha256": "340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221" - } - } - ], - "invocation": { - "configSource": { - "entryPoint": "Dockerfile" - }, - "parameters": { - "frontend": "dockerfile.v0", - "args": { - "build-arg:ARCH": "amd64" - }, - "locals": [ - { - "name": "context" - }, - { - "name": "dockerfile" - } - ] - }, - "environment": { - "platform": "linux/amd64" - } - } - }, - "buildx.build.ref": "cozystack/cozystack0/7j4plhjjn8onm0o8q0omik63x", - "containerimage.config.digest": "sha256:f30f57d817c596f7a7d0ecfe734b7b41994eca9d36d43307206314ee37bdb286", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:f7d86b1a72a12b60434a12a604e9ddd3779d9fa605205c7968fe9495e764c94c", - "size": 1094, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:f7d86b1a72a12b60434a12a604e9ddd3779d9fa605205c7968fe9495e764c94c", - "image.name": "ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0,ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0-v0.10.1" -} \ No newline at end of file diff --git a/packages/apps/http-cache/images/nginx.json b/packages/apps/http-cache/images/nginx.json deleted file mode 100644 index 46348f67..00000000 --- a/packages/apps/http-cache/images/nginx.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "containerimage.config.digest": "sha256:b1916dbacb372ed89ea3f920f08ee68730be2edc016f2caa373a7bbfbad25845", - "containerimage.digest": "sha256:f77d5b63f1ed9dfda4725696d9170130939219a2465260b6ba941947460de2da" -} \ No newline at end of file diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index af3ce9d1..50297511 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.8.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.json b/packages/apps/kubernetes/images/ubuntu-container-disk.json deleted file mode 100644 index 65729082..00000000 --- a/packages/apps/kubernetes/images/ubuntu-container-disk.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "buildx.build.provenance": { - "buildType": "https://mobyproject.org/buildkit@v1", - "materials": [ - { - "uri": "pkg:docker/ubuntu@22.04?platform=linux%2Famd64", - "digest": { - "sha256": "340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221" - } - } - ], - "invocation": { - "configSource": { - "entryPoint": "Dockerfile" - }, - "parameters": { - "frontend": "dockerfile.v0", - "args": { - "build-arg:ARCH": "amd64" - }, - "locals": [ - { - "name": "context" - }, - { - "name": "dockerfile" - } - ] - }, - "environment": { - "platform": "linux/amd64" - } - } - }, - "buildx.build.ref": "cozystack/cozystack0/xkanpm0dojuj7v0lo951qocfb", - "containerimage.config.digest": "sha256:c144c5f12a47af7880ee5f056b14177c07b585b8ab1e68b7e7900e1c923083cf", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:81caf89efe252ae2ca1990d08a3a314552d70ff36bcd4022b173c7150fbec805", - "size": 506, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:81caf89efe252ae2ca1990d08a3a314552d70ff36bcd4022b173c7150fbec805", - "image.name": "ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1,ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1-v0.10.1" -} \ No newline at end of file diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index ed610fa9..8932501e 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -45,7 +45,7 @@ spec: volumes: - name: system containerDisk: - image: "{{ $.Files.Get "images/ubuntu-container-disk.tag" | trim }}@{{ index ($.Files.Get "images/ubuntu-container-disk.json" | fromJson) "containerimage.digest" }}" + image: "{{ $.Files.Get "images/ubuntu-container-disk.tag" | trim }}" - name: ephemeral emptyDisk: capacity: {{ .group.ephemeralStorage | default "20Gi" }} diff --git a/packages/apps/kubernetes/templates/ingress.yaml b/packages/apps/kubernetes/templates/ingress.yaml index 622b46ed..2981c54c 100644 --- a/packages/apps/kubernetes/templates/ingress.yaml +++ b/packages/apps/kubernetes/templates/ingress.yaml @@ -7,16 +7,14 @@ kind: Ingress metadata: name: {{ .Release.Name }}-ingress-nginx annotations: - nginx.ingress.kubernetes.io/ssl-redirect: "false" - nginx.ingress.kubernetes.io/ssl-passthrough: "true" - nginx.ingress.kubernetes.io/backend-protocol: "AUTO_HTTP" + nginx.ingress.kubernetes.io/backend-protocol: AUTO_HTTP nginx.ingress.kubernetes.io/configuration-snippet: | - set $proxy_upstream_name "{{ .Release.Namespace }}-{{ .Release.Name }}-ingress-nginx-80"; - if ($scheme = https) { - set $proxy_upstream_name "{{ .Release.Namespace }}-{{ .Release.Name }}-ingress-nginx-443"; - set $service_port 443; + if ($scheme = http) { + set $proxy_upstream_name "{{ .Release.Namespace }}-{{ .Release.Name }}-ingress-nginx-80"; + set $proxy_host $proxy_upstream_name; } - set $proxy_host $proxy_upstream_name; + nginx.ingress.kubernetes.io/ssl-passthrough: "true" + nginx.ingress.kubernetes.io/ssl-redirect: "false" spec: ingressClassName: "{{ $ingress }}" rules: @@ -30,14 +28,14 @@ spec: service: name: {{ $.Release.Name }}-ingress-nginx port: - number: 80 + number: 443 - path: / pathType: ImplementationSpecific backend: service: name: {{ $.Release.Name }}-ingress-nginx port: - number: 443 + number: 80 {{- end }} --- apiVersion: v1 diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json deleted file mode 100644 index 5bd2cc81..00000000 --- a/packages/core/installer/images/cozystack.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "buildx.build.ref": "cozystack/cozystack0/zk58yqp4vkrfgx3gdjumn9k70", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json", - "digest": "sha256:b92988122fa68adc85751384170a46895b5761cc5bf27e80b0b53b12b89b6d6c", - "size": 685 - }, - "containerimage.digest": "sha256:b92988122fa68adc85751384170a46895b5761cc5bf27e80b0b53b12b89b6d6c", - "image.name": "ghcr.io/aenix-io/cozystack/cozystack:latest" -} \ No newline at end of file diff --git a/packages/core/installer/images/cozystack.tag b/packages/core/installer/images/cozystack.tag deleted file mode 100644 index 602d7b26..00000000 --- a/packages/core/installer/images/cozystack.tag +++ /dev/null @@ -1 +0,0 @@ -ghcr.io/aenix-io/cozystack/cozystack:latest diff --git a/packages/core/installer/images/matchbox.json b/packages/core/installer/images/matchbox.json deleted file mode 100644 index c93aacbb..00000000 --- a/packages/core/installer/images/matchbox.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "buildx.build.provenance": { - "buildType": "https://mobyproject.org/buildkit@v1", - "materials": [ - { - "uri": "pkg:docker/quay.io/poseidon/matchbox@v0.10.0?platform=linux%2Famd64", - "digest": { - "sha256": "e14cc4a8f6e8f1182fce74d04fe949b6bfc91b04132b3944297661e2c38c9790" - } - } - ], - "invocation": { - "configSource": { - "entryPoint": "Dockerfile" - }, - "parameters": { - "frontend": "dockerfile.v0", - "locals": [ - { - "name": "context" - }, - { - "name": "dockerfile" - } - ] - }, - "environment": { - "platform": "linux/amd64" - } - } - }, - "buildx.build.ref": "cozystack/cozystack0/qu2ygr61roizh7ga2l4kkmdx6", - "containerimage.config.digest": "sha256:94aa5abc006ac672ccdd91b8d9361fd14de6e0b286299f4e44dd09002becc3b7", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:b1e6084402619dde9dcdc8251cd581cbfc3940c885e938547b7b7306376a411e", - "size": 1488, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:b1e6084402619dde9dcdc8251cd581cbfc3940c885e938547b7b7306376a411e", - "image.name": "ghcr.io/aenix-io/cozystack/matchbox:v0.10.1,ghcr.io/aenix-io/cozystack/matchbox:v1.7.1-v0.10.1" -} \ No newline at end of file diff --git a/packages/core/installer/images/matchbox.tag b/packages/core/installer/images/matchbox.tag deleted file mode 100644 index dadda235..00000000 --- a/packages/core/installer/images/matchbox.tag +++ /dev/null @@ -1 +0,0 @@ -ghcr.io/aenix-io/cozystack/matchbox:v1.7.1 diff --git a/packages/system/dashboard/images/dashboard.json b/packages/system/dashboard/images/dashboard.json deleted file mode 100644 index a97ddb95..00000000 --- a/packages/system/dashboard/images/dashboard.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "buildx.build.provenance": { - "buildType": "https://mobyproject.org/buildkit@v1", - "materials": [ - { - "uri": "pkg:docker/bitnami/nginx@1.25.2?platform=linux%2Famd64", - "digest": { - "sha256": "fbd9335f55d83d8aaf9ab1a539b0f2a87b444e8c54f34c9a1ca9d7df15605db4" - } - }, - { - "uri": "pkg:docker/bitnami/node@20.12.1?platform=linux%2Famd64", - "digest": { - "sha256": "ac00b5d3742ef2b522e149ac3912a9118ca8dc27556f13700d4a53c1982b1460" - } - } - ], - "invocation": { - "configSource": { - "entryPoint": "Dockerfile" - }, - "parameters": { - "frontend": "dockerfile.v0", - "locals": [ - { - "name": "context" - }, - { - "name": "dockerfile" - } - ] - }, - "environment": { - "platform": "linux/amd64" - } - } - }, - "buildx.build.ref": "cozystack/cozystack0/puq8k1x2nsc986l15a2vanb8s", - "containerimage.config.digest": "sha256:2c68c6ce6620a8c8afd84fed1c2265738d661a47ded0be21b2517b0309ed7307", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:fdabfe2caa3fe2d92ca4a07b60a55c91163d7db25aa12cc4c6034c32ac1dcb17", - "size": 703, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:fdabfe2caa3fe2d92ca4a07b60a55c91163d7db25aa12cc4c6034c32ac1dcb17", - "image.name": "ghcr.io/aenix-io/cozystack/dashboard:v0.10.1" -} \ No newline at end of file diff --git a/packages/system/dashboard/images/dashboard.tag b/packages/system/dashboard/images/dashboard.tag deleted file mode 100644 index 2158032b..00000000 --- a/packages/system/dashboard/images/dashboard.tag +++ /dev/null @@ -1 +0,0 @@ -ghcr.io/aenix-io/cozystack/dashboard:v0.10.1 diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json deleted file mode 100644 index 15913615..00000000 --- a/packages/system/dashboard/images/kubeapps-apis.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "buildx.build.provenance": { - "buildType": "https://mobyproject.org/buildkit@v1", - "materials": [ - { - "uri": "pkg:docker/bitnami/golang@1.22.2?platform=linux%2Famd64", - "digest": { - "sha256": "f6238d0feb519be3a157e0f29d56312fdcbfde165d96987f3956581126371977" - } - }, - { - "uri": "pkg:docker/bitnami/minideb@bookworm?platform=linux%2Famd64", - "digest": { - "sha256": "b13cb4b41be91e22858e9b050a51137b636a34694a92ff17c27cb010e5f93f04" - } - }, - { - "uri": "pkg:docker/alpine@latest?platform=linux%2Famd64", - "digest": { - "sha256": "0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5" - } - } - ], - "invocation": { - "configSource": { - "entryPoint": "Dockerfile" - }, - "parameters": { - "frontend": "dockerfile.v0", - "locals": [ - { - "name": "context" - }, - { - "name": "dockerfile" - } - ] - }, - "environment": { - "platform": "linux/amd64" - } - } - }, - "buildx.build.ref": "cozystack/cozystack0/nk99hhpt81cl5xu6eecdk86qs", - "containerimage.config.digest": "sha256:662ea8b8642d1c6662e5eef79ea8329863f5178a80457e1faf983506efe7a611", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:eaedcb64abd1c245bd2959c66df430d0fcbbb5968334501f484231707de7ed7d", - "size": 1890, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:eaedcb64abd1c245bd2959c66df430d0fcbbb5968334501f484231707de7ed7d", - "image.name": "ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.10.1" -} \ No newline at end of file diff --git a/packages/system/dashboard/images/kubeapps-apis.tag b/packages/system/dashboard/images/kubeapps-apis.tag deleted file mode 100644 index 0f05e344..00000000 --- a/packages/system/dashboard/images/kubeapps-apis.tag +++ /dev/null @@ -1 +0,0 @@ -ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.10.1 diff --git a/packages/system/kubeovn/images/kubeovn.json b/packages/system/kubeovn/images/kubeovn.json deleted file mode 100644 index 02e20ede..00000000 --- a/packages/system/kubeovn/images/kubeovn.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "buildx.build.provenance": { - "buildType": "https://mobyproject.org/buildkit@v1", - "materials": [ - { - "uri": "pkg:docker/kubeovn/kube-ovn-base@v1.13.0?platform=linux%2Famd64", - "digest": { - "sha256": "789041d6e02edaa9a28f9385e2175d47cecd564d163e7a0fb89d225de8ada2a2" - } - }, - { - "uri": "pkg:docker/golang@1.22-bookworm?platform=linux%2Famd64", - "digest": { - "sha256": "800e361142daeb47b5e5bce2ede55be8d67159be75748cb31cbb48798ebec39d" - } - } - ], - "invocation": { - "configSource": { - "entryPoint": "Dockerfile" - }, - "parameters": { - "frontend": "dockerfile.v0", - "locals": [ - { - "name": "context" - }, - { - "name": "dockerfile" - } - ] - }, - "environment": { - "platform": "linux/amd64" - } - } - }, - "buildx.build.ref": "mybuild/mybuild0/sgrxqzg8w1l4zxyi2tpcluk8p", - "containerimage.config.digest": "sha256:7bdcdea14eb90de0b87b53e79e1b1fbe35ead5be316a7b4f83859454cb5506af", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:89cac6416d9a8bae534d1f5276b0d0a399e873d6b919bb6a3ad780ecf71c8b81", - "size": 4621, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:89cac6416d9a8bae534d1f5276b0d0a399e873d6b919bb6a3ad780ecf71c8b81", - "image.name": "ghcr.io/aenix-io/cozystack/kubeovn:v1.13.0,ghcr.io/aenix-io/cozystack/kubeovn:v1.13.0-v0.10.0" -} \ No newline at end of file