forked from suse-edge/Factory
Compare commits
1 Commits
main
...
375f77edc8
Author | SHA256 | Date | |
---|---|---|---|
|
375f77edc8 |
2
_config
2
_config
@@ -1,5 +1,5 @@
|
||||
Prefer: -libqpid-proton10 -python311-urllib3_1
|
||||
Prefer: -cargo1.58 -cargo1.57 cargo1.89
|
||||
Prefer: -cargo1.58 -cargo1.57 cargo1.88
|
||||
|
||||
Macros:
|
||||
%__python3 /usr/bin/python3.11
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.3_up1.3.1
|
||||
#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.3_up1.3.1-%RELEASE%
|
||||
#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.1
|
||||
#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.1-%RELEASE%
|
||||
annotations:
|
||||
catalog.cattle.io/certified: rancher
|
||||
catalog.cattle.io/namespace: cattle-ui-plugin-system
|
||||
@@ -12,10 +12,10 @@ annotations:
|
||||
catalog.cattle.io/ui-extensions-version: '>= 3.0.2 < 4.0.0'
|
||||
catalog.cattle.io/kube-version: '>= v1.26.0-0'
|
||||
apiVersion: v2
|
||||
appVersion: 304.0.3+up1.3.1
|
||||
appVersion: 303.0.2+up1.3.1
|
||||
description: 'SUSE Edge: Akri extension for Rancher Dashboard'
|
||||
name: akri-dashboard-extension
|
||||
type: application
|
||||
version: "%%CHART_MAJOR%%.0.3+up1.3.1"
|
||||
version: "%%CHART_MAJOR%%.0.2+up1.3.1"
|
||||
icon: >-
|
||||
https://raw.githubusercontent.com/cncf/artwork/main/projects/akri/icon/color/akri-icon-color.svg
|
||||
|
@@ -8,7 +8,7 @@ spec:
|
||||
plugin:
|
||||
name: {{ include "extension-server.fullname" . }}
|
||||
version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
|
||||
endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/304.0.3+up1.3.1
|
||||
endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/303.0.2+up1.3.1
|
||||
noCache: {{ .Values.plugin.noCache }}
|
||||
noAuth: {{ .Values.plugin.noAuth }}
|
||||
metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.3_up1.3.2
|
||||
#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.3_up1.3.2-%RELEASE%
|
||||
#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.2
|
||||
#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.2-%RELEASE%
|
||||
annotations:
|
||||
catalog.cattle.io/certified: rancher
|
||||
catalog.cattle.io/namespace: cattle-ui-plugin-system
|
||||
@@ -12,10 +12,10 @@ annotations:
|
||||
catalog.cattle.io/ui-extensions-version: '>= 3.0.2 < 4.0.0'
|
||||
catalog.cattle.io/kube-version: '>= v1.26.0-0'
|
||||
apiVersion: v2
|
||||
appVersion: 304.0.3+up1.3.2
|
||||
appVersion: 303.0.2+up1.3.2
|
||||
description: 'SUSE Edge: KubeVirt extension for Rancher Dashboard'
|
||||
name: kubevirt-dashboard-extension
|
||||
type: application
|
||||
version: "%%CHART_MAJOR%%.0.3+up1.3.2"
|
||||
version: "%%CHART_MAJOR%%.0.2+up1.3.2"
|
||||
icon: >-
|
||||
https://raw.githubusercontent.com/cncf/artwork/master/projects/kubevirt/icon/color/kubevirt-icon-color.svg
|
||||
|
@@ -8,7 +8,7 @@ spec:
|
||||
plugin:
|
||||
name: {{ include "extension-server.fullname" . }}
|
||||
version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
|
||||
endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/304.0.3+up1.3.2
|
||||
endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/303.0.2+up1.3.2
|
||||
noCache: {{ .Values.plugin.noCache }}
|
||||
noAuth: {{ .Values.plugin.noAuth }}
|
||||
metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
|
||||
|
@@ -1,12 +1,12 @@
|
||||
#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.14_up0.12.4
|
||||
#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.14_up0.12.4-%RELEASE%
|
||||
#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.13_up0.12.3
|
||||
#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.13_up0.12.3-%RELEASE%
|
||||
apiVersion: v2
|
||||
appVersion: 0.12.4
|
||||
appVersion: 0.12.3
|
||||
dependencies:
|
||||
- alias: metal3-baremetal-operator
|
||||
name: baremetal-operator
|
||||
repository: file://./charts/baremetal-operator
|
||||
version: 0.10.3
|
||||
version: 0.10.2
|
||||
- alias: metal3-ironic
|
||||
name: ironic
|
||||
repository: file://./charts/ironic
|
||||
@@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal
|
||||
icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
|
||||
name: metal3
|
||||
type: application
|
||||
version: "%%CHART_MAJOR%%.0.14+up0.12.4"
|
||||
version: "%%CHART_MAJOR%%.0.13+up0.12.3"
|
||||
|
@@ -3,4 +3,4 @@ appVersion: 0.10.2
|
||||
description: A Helm chart for baremetal-operator, used by Metal3
|
||||
name: baremetal-operator
|
||||
type: application
|
||||
version: 0.10.3
|
||||
version: 0.10.2
|
||||
|
@@ -24,10 +24,6 @@ data:
|
||||
DEPLOY_KERNEL_URL: "{{ $protocol }}://{{ $ironicBootHost }}/images/ironic-python-agent-{{ $deployArch }}.kernel"
|
||||
DEPLOY_RAMDISK_URL: "{{ $protocol }}://{{ $ironicBootHost }}/images/ironic-python-agent-{{ $deployArch }}.initramfs"
|
||||
DEPLOY_ARCHITECTURE: "{{ $deployArch }}"
|
||||
{{- if .Values.baremetaloperator.externalHttpIPv6 }}
|
||||
{{- $port := ternary .Values.global.vmediaTLSPort .Values.baremetaloperator.httpPort $enableVMediaTLS }}
|
||||
IRONIC_EXTERNAL_URL_V6: "{{ $protocol }}://[{{ .Values.baremetaloperator.externalHttpIPv6 }}]:{{ $port }}"
|
||||
{{- end }}
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: baremetal-operator-ironic
|
||||
|
@@ -84,8 +84,3 @@ affinity: {}
|
||||
|
||||
baremetaloperator:
|
||||
httpPort: "6180"
|
||||
|
||||
# IPv6 used for accessing the Ironic HTTP server for BMCs with an IPv6 only address.
|
||||
# It should not be used in conjunction with 'provisioningHostname' unless BMCs do not
|
||||
# support hostnames.
|
||||
externalHttpIPv6: ""
|
||||
|
@@ -1,39 +0,0 @@
|
||||
From 2e89940b44d4be1d115aed987b4c610ed7173d66 Mon Sep 17 00:00:00 2001
|
||||
From: e-minguez <e.minguez@gmail.com>
|
||||
Date: Tue, 2 Sep 2025 18:03:50 +0200
|
||||
Subject: [PATCH] fix: Allow icon metadata to be file
|
||||
|
||||
Fix #34
|
||||
---
|
||||
pyhelm3/models.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pyhelm3/models.py b/pyhelm3/models.py
|
||||
index d03fdc6..adb2c88 100644
|
||||
--- a/pyhelm3/models.py
|
||||
+++ b/pyhelm3/models.py
|
||||
@@ -14,6 +14,7 @@
|
||||
FilePath,
|
||||
AnyUrl as PydanticAnyUrl,
|
||||
HttpUrl as PydanticHttpUrl,
|
||||
+ FileUrl as PydanticFileUrl,
|
||||
constr,
|
||||
field_validator
|
||||
)
|
||||
@@ -65,6 +66,7 @@ def validate_str_as(validate_type):
|
||||
#: Annotated string types for URLs
|
||||
AnyUrl = t.Annotated[str, AfterValidator(validate_str_as(PydanticAnyUrl))]
|
||||
HttpUrl = t.Annotated[str, AfterValidator(validate_str_as(PydanticHttpUrl))]
|
||||
+FileUrl = t.Annotated[str, AfterValidator(validate_str_as(PydanticFileUrl))]
|
||||
|
||||
|
||||
class ChartDependency(BaseModel):
|
||||
@@ -173,7 +175,7 @@ class ChartMetadata(BaseModel):
|
||||
default_factory = list,
|
||||
description = "List of maintainers for the chart."
|
||||
)
|
||||
- icon: t.Optional[HttpUrl] = Field(
|
||||
+ icon: t.Optional[HttpUrl | FileUrl] = Field(
|
||||
None,
|
||||
description = "URL to an SVG or PNG image to be used as an icon."
|
||||
)
|
@@ -16,15 +16,12 @@
|
||||
|
||||
Name: python-pyhelm3
|
||||
Version: 0.4.0
|
||||
Release: 1
|
||||
Release: 0
|
||||
Summary: Python library for managing Helm releases using Helm 3
|
||||
License: Apache-2.0
|
||||
URL: https://github.com/azimuth-cloud/pyhelm3
|
||||
#!RemoteAsset
|
||||
Source: https://files.pythonhosted.org/packages/source/p/pyhelm3/pyhelm3-%{version}.tar.gz
|
||||
# Allow icon metadata to be file:// as well as http/https://
|
||||
# https://github.com/azimuth-cloud/pyhelm3/pull/35
|
||||
Patch: 0001-icon-metadata-allow-fileurl.patch
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: %{python_module pip}
|
||||
BuildRequires: %{python_module setuptools >= 42}
|
||||
|
@@ -119,7 +119,7 @@ spec:
|
||||
addonCharts:
|
||||
- releaseName: kubevirt-dashboard-extension
|
||||
chart: '%%CHART_REPO%%/%%CHART_PREFIX%%kubevirt-dashboard-extension'
|
||||
version: '%%CHART_MAJOR%%.0.3+up1.3.2'
|
||||
version: '%%CHART_MAJOR%%.0.2+up1.3.2'
|
||||
- prettyName: NeuVector
|
||||
releaseName: neuvector
|
||||
chart: neuvector
|
||||
@@ -167,11 +167,11 @@ spec:
|
||||
addonCharts:
|
||||
- releaseName: akri-dashboard-extension
|
||||
chart: '%%CHART_REPO%%/%%CHART_PREFIX%%akri-dashboard-extension'
|
||||
version: '%%CHART_MAJOR%%.0.3+up1.3.1'
|
||||
version: '%%CHART_MAJOR%%.0.2+up1.3.1'
|
||||
- prettyName: Metal3
|
||||
releaseName: metal3
|
||||
chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3'
|
||||
version: '%%CHART_MAJOR%%.0.14+up0.12.4'
|
||||
version: '%%CHART_MAJOR%%.0.13+up0.12.3'
|
||||
- prettyName: RancherTurtles
|
||||
releaseName: rancher-turtles
|
||||
chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles'
|
||||
|
Reference in New Issue
Block a user