From bd90eb267f39e911b0b91584959a79ef87e46e81 Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Tue, 18 Feb 2025 17:22:41 +0300 Subject: [PATCH 1/4] Prepare release v0.25.2 --- packages/system/dashboard/images/dashboard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/system/dashboard/images/dashboard/Dockerfile b/packages/system/dashboard/images/dashboard/Dockerfile index 59073e2e..d474872e 100644 --- a/packages/system/dashboard/images/dashboard/Dockerfile +++ b/packages/system/dashboard/images/dashboard/Dockerfile @@ -1,7 +1,7 @@ FROM bitnami/node:20.15.1 AS build WORKDIR /app -ARG COMMIT_REF=dd02680d796c962b8dcc4e5ea70960a846c1acdc +ARG COMMIT_REF=190ea544aeb0be74bb6d1aa4bb474910559e7ecd RUN wget -O- https://github.com/aenix-io/kubeapps/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=2 kubeapps-${COMMIT_REF}/dashboard RUN yarn install --frozen-lockfile From 9a5574788541cc892f333c5002085628f8a9723a Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Tue, 18 Feb 2025 17:40:54 +0300 Subject: [PATCH 2/4] add more resources --- packages/system/capi-providers/templates/providers.yaml | 7 +++++++ packages/system/keycloak-operator/values.yaml | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/packages/system/capi-providers/templates/providers.yaml b/packages/system/capi-providers/templates/providers.yaml index 06a605f2..0c2f1b2a 100644 --- a/packages/system/capi-providers/templates/providers.yaml +++ b/packages/system/capi-providers/templates/providers.yaml @@ -14,6 +14,13 @@ metadata: spec: # https://github.com/clastix/cluster-api-control-plane-provider-kamaji version: v0.11.0 + deployment: + containers: + - name: manager + resources: + limits: + cpu: 1024m + memory: 1024Mi --- apiVersion: operator.cluster.x-k8s.io/v1alpha2 kind: BootstrapProvider diff --git a/packages/system/keycloak-operator/values.yaml b/packages/system/keycloak-operator/values.yaml index 573e5b20..fc61c51f 100644 --- a/packages/system/keycloak-operator/values.yaml +++ b/packages/system/keycloak-operator/values.yaml @@ -1,2 +1,8 @@ keycloak-operator: clusterReconciliationEnabled: true + resources: + limits: + memory: 512Mi + requests: + cpu: 50m + memory: 64Mi From 6c73e3f3ae841ad144fa18aa28a7d231b3ab63cd Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Thu, 20 Feb 2025 15:23:54 +0300 Subject: [PATCH 3/4] feature/mv-kubeconfig --- packages/apps/tenant/Chart.yaml | 2 +- packages/apps/tenant/templates/info.yaml | 27 +++++++++++++++++++ packages/apps/tenant/templates/tenant.yaml | 1 + packages/apps/versions_map | 3 ++- packages/extra/info/.helmignore | 2 ++ packages/extra/info/Chart.yaml | 6 +++++ packages/extra/info/Makefile | 3 +++ packages/extra/info/README.md | 18 +++++++++++++ packages/extra/info/logos/info.svg | 13 +++++++++ .../templates/dashboard-resourcemap.yaml | 5 ++-- .../info}/templates/kubeconfig.yaml | 9 +++---- packages/extra/info/values.schema.json | 1 + packages/extra/info/values.yaml | 0 packages/extra/versions_map | 1 + .../cozystack-api/templates/configmap.yaml | 14 ++++++++++ packages/system/dashboard/values.yaml | 14 ++++++++++ 16 files changed, 109 insertions(+), 10 deletions(-) create mode 100644 packages/apps/tenant/templates/info.yaml create mode 100644 packages/extra/info/.helmignore create mode 100644 packages/extra/info/Chart.yaml create mode 100644 packages/extra/info/Makefile create mode 100644 packages/extra/info/README.md create mode 100644 packages/extra/info/logos/info.svg rename packages/{apps/tenant => extra/info}/templates/dashboard-resourcemap.yaml (53%) rename packages/{apps/tenant => extra/info}/templates/kubeconfig.yaml (87%) create mode 100644 packages/extra/info/values.schema.json create mode 100644 packages/extra/info/values.yaml diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml index dfaabd5a..d8f2853a 100644 --- a/packages/apps/tenant/Chart.yaml +++ b/packages/apps/tenant/Chart.yaml @@ -4,4 +4,4 @@ description: Separated tenant namespace icon: /logos/tenant.svg type: application -version: 1.6.8 +version: 1.7.0 diff --git a/packages/apps/tenant/templates/info.yaml b/packages/apps/tenant/templates/info.yaml new file mode 100644 index 00000000..08e32329 --- /dev/null +++ b/packages/apps/tenant/templates/info.yaml @@ -0,0 +1,27 @@ +{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} +{{- $oidcEnabled := index $cozyConfig.data "oidc-enabled" }} +{{- if $oidcEnabled }} +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: info + namespace: {{ include "tenant.name" . }} + annotations: + helm.sh/resource-policy: keep + labels: + cozystack.io/ui: "true" + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + chart: + spec: + chart: info + reconcileStrategy: Revision + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public + version: "*" + interval: 1m0s + timeout: 5m0s +{{- end }} diff --git a/packages/apps/tenant/templates/tenant.yaml b/packages/apps/tenant/templates/tenant.yaml index 7aecc793..b9e1e497 100644 --- a/packages/apps/tenant/templates/tenant.yaml +++ b/packages/apps/tenant/templates/tenant.yaml @@ -272,6 +272,7 @@ rules: - virtualmachines - vmdisks - vminstances + - infos verbs: - get - list diff --git a/packages/apps/versions_map b/packages/apps/versions_map index b8659212..cd962870 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -102,7 +102,8 @@ tenant 1.6.4 3c9e50a4 tenant 1.6.5 f1e11451 tenant 1.6.6 d4634797 tenant 1.6.7 06afcf27 -tenant 1.6.8 HEAD +tenant 1.6.8 4cc48e6f +tenant 1.7.0 HEAD virtual-machine 0.1.4 f2015d6 virtual-machine 0.1.5 7cd7de7 virtual-machine 0.2.0 5ca8823 diff --git a/packages/extra/info/.helmignore b/packages/extra/info/.helmignore new file mode 100644 index 00000000..62e0c051 --- /dev/null +++ b/packages/extra/info/.helmignore @@ -0,0 +1,2 @@ +.helmignore +/logos diff --git a/packages/extra/info/Chart.yaml b/packages/extra/info/Chart.yaml new file mode 100644 index 00000000..2865c6df --- /dev/null +++ b/packages/extra/info/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: info +description: Info +icon: /logos/info.svg +type: application +version: 1.0.0 diff --git a/packages/extra/info/Makefile b/packages/extra/info/Makefile new file mode 100644 index 00000000..86ce0ede --- /dev/null +++ b/packages/extra/info/Makefile @@ -0,0 +1,3 @@ +NAME=etcd + +include ../../../scripts/package.mk diff --git a/packages/extra/info/README.md b/packages/extra/info/README.md new file mode 100644 index 00000000..e361cfe6 --- /dev/null +++ b/packages/extra/info/README.md @@ -0,0 +1,18 @@ +# Info + +### Kubeconfig for tenant + +### Kubelogin + +For using kubeconfig need install kubelogin. + +```bash +# Homebrew (macOS and Linux) +brew install int128/kubelogin/kubelogin + +# Krew (macOS, Linux, Windows and ARM) +kubectl krew install oidc-login + +# Chocolatey (Windows) +choco install kubelogin +``` diff --git a/packages/extra/info/logos/info.svg b/packages/extra/info/logos/info.svg new file mode 100644 index 00000000..c5edee82 --- /dev/null +++ b/packages/extra/info/logos/info.svg @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/apps/tenant/templates/dashboard-resourcemap.yaml b/packages/extra/info/templates/dashboard-resourcemap.yaml similarity index 53% rename from packages/apps/tenant/templates/dashboard-resourcemap.yaml rename to packages/extra/info/templates/dashboard-resourcemap.yaml index 9020b8a0..e0dccc23 100644 --- a/packages/apps/tenant/templates/dashboard-resourcemap.yaml +++ b/packages/extra/info/templates/dashboard-resourcemap.yaml @@ -1,13 +1,12 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ include "tenant.name" . }}-dashboard-resources - namespace: {{ .Release.namespace }} + name: info-dashboard-resources rules: - apiGroups: - "" resources: - secrets resourceNames: - - kubeconfig-{{ include "tenant.name" . }} + - kubeconfig-{{ .Release.Namespace }} verbs: ["get", "list", "watch"] diff --git a/packages/apps/tenant/templates/kubeconfig.yaml b/packages/extra/info/templates/kubeconfig.yaml similarity index 87% rename from packages/apps/tenant/templates/kubeconfig.yaml rename to packages/extra/info/templates/kubeconfig.yaml index 85a2acd1..ff8127d2 100644 --- a/packages/apps/tenant/templates/kubeconfig.yaml +++ b/packages/extra/info/templates/kubeconfig.yaml @@ -15,8 +15,7 @@ apiVersion: v1 kind: Secret metadata: - name: kubeconfig-{{ include "tenant.name" . }} - namespace: tenant-root + name: kubeconfig-{{ .Release.Namespace }} stringData: kubeconfig: | apiVersion: v1 @@ -28,10 +27,10 @@ stringData: contexts: - context: cluster: cluster - namespace: {{ include "tenant.name" . }} + namespace: {{ .Release.Namespace }} user: keycloak - name: {{ include "tenant.name" . }} - current-context: {{ include "tenant.name" . }} + name: {{ .Release.Namespace }} + current-context: {{ .Release.Namespace }} users: - name: keycloak user: diff --git a/packages/extra/info/values.schema.json b/packages/extra/info/values.schema.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/packages/extra/info/values.schema.json @@ -0,0 +1 @@ +{} diff --git a/packages/extra/info/values.yaml b/packages/extra/info/values.yaml new file mode 100644 index 00000000..e69de29b diff --git a/packages/extra/versions_map b/packages/extra/versions_map index a2cf6af8..bc18c57e 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -7,6 +7,7 @@ etcd 2.2.0 5ca8823 etcd 2.3.0 b908400d etcd 2.4.0 cb7b8158 etcd 2.5.0 HEAD +info 1.0.0 HEAD ingress 1.0.0 f642698 ingress 1.1.0 838bee5d ingress 1.2.0 ced8e5b diff --git a/packages/system/cozystack-api/templates/configmap.yaml b/packages/system/cozystack-api/templates/configmap.yaml index f8514d00..8fccd427 100644 --- a/packages/system/cozystack-api/templates/configmap.yaml +++ b/packages/system/cozystack-api/templates/configmap.yaml @@ -314,3 +314,17 @@ data: kind: HelmRepository name: cozystack-extra namespace: cozy-public + - application: + kind: Info + plural: infos + singular: info + release: + prefix: "" + labels: + cozystack.io/ui: "true" + chart: + name: info + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 7a0840aa..c1252dc5 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -361,3 +361,17 @@ kubeapps: kind: HelmRepository name: cozystack-extra namespace: cozy-public + - application: + kind: Info + plural: infos + singular: info + release: + prefix: "" + labels: + cozystack.io/ui: "true" + chart: + name: info + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public From 0211c57bed6350f08c3b4a2630043ce8d8000ab3 Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Sat, 22 Feb 2025 10:33:32 +0300 Subject: [PATCH 4/4] Prepare release v0.25.3 --- manifests/cozystack-installer.yaml | 4 ++-- packages/apps/kubernetes/images/cluster-autoscaler.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/extra/monitoring/images/grafana.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 4 ++-- packages/system/kamaji/values.yaml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/manifests/cozystack-installer.yaml b/manifests/cozystack-installer.yaml index 69b2501a..cd2d4f2a 100644 --- a/manifests/cozystack-installer.yaml +++ b/manifests/cozystack-installer.yaml @@ -68,7 +68,7 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.25.1" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.25.3" env: - name: KUBERNETES_SERVICE_HOST value: localhost @@ -87,7 +87,7 @@ spec: fieldRef: fieldPath: metadata.name - name: assets - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.25.1" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.25.3" command: - /usr/bin/cozystack-assets-server - "-dir=/cozystack/assets" diff --git a/packages/apps/kubernetes/images/cluster-autoscaler.tag b/packages/apps/kubernetes/images/cluster-autoscaler.tag index 5e9f0886..421619b1 100644 --- a/packages/apps/kubernetes/images/cluster-autoscaler.tag +++ b/packages/apps/kubernetes/images/cluster-autoscaler.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/cluster-autoscaler:0.15.0@sha256:50efa0d1e807c50d10e8fcece332e4eb7de464e98b23db6e3be02a1ef740821f +ghcr.io/aenix-io/cozystack/cluster-autoscaler:0.15.0@sha256:fa37449761fefd2e04385be505cb669b0f1efcddc2f1ba42c4fcd38af4ea4361 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 516ba171..20562770 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.25.2@sha256:5b70cd5a01d1c32f9072e37d3f5ae91f2a52516ff11dd25325c7da7ddba73c8b + image: ghcr.io/aenix-io/cozystack/cozystack:v0.25.3@sha256:d0d3739f2ffd8edca7a143d48bc4cf7c3e4f84910fb76c340e1e8a43bf303c7c diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 61b5756b..699e52c7 100755 --- 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:v0.25.2@sha256:3c505ef20030ee4ff9412553c7ecc2077c01fb2785ff48991c404e09cd0db69f + image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.25.3@sha256:3c505ef20030ee4ff9412553c7ecc2077c01fb2785ff48991c404e09cd0db69f diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index e8fe34b8..4285277d 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/matchbox:v0.25.2@sha256:32350617412bf29d4a8f29364e95f9814506522f98d31acab0ab19967613eef7 +ghcr.io/aenix-io/cozystack/matchbox:v0.25.3@sha256:2e5c6e4530f3421f8133485d2bb092374ec10ae198a4b685aef61ff1e7fa9aff diff --git a/packages/extra/monitoring/images/grafana.tag b/packages/extra/monitoring/images/grafana.tag index 6c2e9856..4948a2ec 100644 --- a/packages/extra/monitoring/images/grafana.tag +++ b/packages/extra/monitoring/images/grafana.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/grafana:1.8.0@sha256:0377abd3cb2c6e27b12ac297f1859aa4d550f1aa14989f824f2315d0dfd1a5b2 +ghcr.io/aenix-io/cozystack/grafana:1.8.0@sha256:1a484f970903cc38745251f3fbc1d4737065f2d0a8a08c0adccc8972aa25aa59 diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index fab6fd93..0f53e3b7 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/aenix-io/cozystack/cozystack-api:v0.25.2@sha256:ade847d803ffe9538fc063a8427d7ca87187ac9eb18a584104dfce741be0d0cf + image: ghcr.io/aenix-io/cozystack/cozystack-api:v0.25.3@sha256:5a37def468ce2356d933c80efa71e2eb2608b549602be2f5f07c7a63df4c79cd diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 6be8cbe9..2fead153 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/aenix-io/cozystack/cozystack-controller:v0.25.2@sha256:310df1af9d6feb1604b56eab57ee43c82b080f9103d229b3f1cebf9525a04501 + image: ghcr.io/aenix-io/cozystack/cozystack-controller:v0.25.3@sha256:15ef459bac44b5fedadb4bef987b5236a23bfbc3066156e87e5d13b0d7d60063 debug: false disableTelemetry: false - cozystackVersion: "v0.25.2" + cozystackVersion: "v0.25.3" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index a9cd6f06..5695fe95 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.25.2", + "appVersion": "v0.25.3", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index c1252dc5..5572da62 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -40,13 +40,13 @@ kubeapps: image: registry: ghcr.io/aenix-io/cozystack repository: dashboard - tag: v0.25.2 + tag: v0.25.3 digest: "sha256:4a5dab471c358f826920693591d153dacb81ff7d499daa19edd1f74109f12224" kubeappsapis: image: registry: ghcr.io/aenix-io/cozystack repository: kubeapps-apis - tag: v0.25.2 + tag: v0.25.3 digest: "sha256:69e16490aff84e9084748011b7ae212679b8916cb882032436df450202aea37b" pluginConfig: flux: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index 4e4abb60..588c5eb8 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.25.2@sha256:229646a728b58dd0c55dae7abd721ab23e3feecd61f55fa3ad24bb3a614d558f + tag: v0.25.3@sha256:229646a728b58dd0c55dae7abd721ab23e3feecd61f55fa3ad24bb3a614d558f repository: ghcr.io/aenix-io/cozystack/kamaji resources: limits: