chore: Abandon 892704 patch
diff --git a/charts/magnum/charts/helm-toolkit/Chart.yaml b/charts/magnum/charts/helm-toolkit/Chart.yaml
index 7d3703e..e6aec81 100644
--- a/charts/magnum/charts/helm-toolkit/Chart.yaml
+++ b/charts/magnum/charts/helm-toolkit/Chart.yaml
@@ -9,4 +9,4 @@
sources:
- https://opendev.org/openstack/openstack-helm-infra
- https://opendev.org/openstack/openstack-helm
-version: 0.2.53
+version: 0.2.54
diff --git a/charts/magnum/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl b/charts/magnum/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl
index b99c00d..4a88dd8 100644
--- a/charts/magnum/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl
+++ b/charts/magnum/charts/helm-toolkit/templates/utils/_dependency_resolver.tpl
@@ -27,10 +27,12 @@
{{- else if kindIs "slice" $dependencyMixinParam }}
{{- $_ := set $envAll.Values "__deps" ( index $envAll.Values.dependencies.static $dependencyKey ) }}
{{- range $k, $v := $dependencyMixinParam -}}
+{{- if ( index $envAll.Values.dependencies.dynamic.targeted $v ) }}
{{- $_ := include "helm-toolkit.utils.merge" (tuple $envAll.Values.pod_dependency $envAll.Values.__deps ( index $envAll.Values.dependencies.dynamic.targeted $v $dependencyKey ) ) -}}
{{- $_ := set $envAll.Values "__deps" $envAll.Values.pod_dependency -}}
{{- end }}
{{- end }}
+{{- end }}
{{- else -}}
{{- $_ := set $envAll.Values "pod_dependency" ( index $envAll.Values.dependencies.static $dependencyKey ) -}}
{{- end -}}
diff --git a/charts/magnum/requirements.lock b/charts/magnum/requirements.lock
index 7a9c29d..406a15a 100644
--- a/charts/magnum/requirements.lock
+++ b/charts/magnum/requirements.lock
@@ -1,6 +1,6 @@
dependencies:
- name: helm-toolkit
repository: file://../../openstack-helm-infra/helm-toolkit
- version: 0.2.53
-digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-08-03T12:05:37.921255399Z"
+ version: 0.2.54
+digest: sha256:337a0f1ffb3eae591150b305c22293d85fb8c18abec78f56672de4f3ada2faae
+generated: "2023-09-01T14:09:23.187951159Z"
diff --git a/charts/magnum/templates/configmap-etc.yaml b/charts/magnum/templates/configmap-etc.yaml
index bbd9753..466e2ae 100644
--- a/charts/magnum/templates/configmap-etc.yaml
+++ b/charts/magnum/templates/configmap-etc.yaml
@@ -71,10 +71,6 @@
{{- $_ := set .Values.conf.magnum.trust "trustee_domain_admin_password" .Values.endpoints.identity.auth.magnum_stack_user.password -}}
{{- end -}}
-{{- if not .Values.conf.paste }}
-{{- $_ := set $envAll.Values.conf.magnum.api "api_paste_config" "/var/lib/openstack/etc/magnum/api-paste.ini" -}}
-{{- end }}
-
{{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}}
{{- $fluentd_host := tuple "fluentd" "internal" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
{{- $fluentd_port := tuple "fluentd" "internal" "service" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
@@ -96,8 +92,6 @@
data:
magnum.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.magnum | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
- {{- if .Values.conf.paste }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
- {{- end }}
policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
{{- end }}
diff --git a/charts/magnum/templates/deployment-api.yaml b/charts/magnum/templates/deployment-api.yaml
index d7873eb..fbb43d2 100644
--- a/charts/magnum/templates/deployment-api.yaml
+++ b/charts/magnum/templates/deployment-api.yaml
@@ -98,12 +98,10 @@
subPath: {{ base .Values.conf.magnum.DEFAULT.log_config_append }}
readOnly: true
{{- end }}
- {{- if .Values.conf.paste }}
- name: magnum-etc
mountPath: /etc/magnum/api-paste.ini
subPath: api-paste.ini
readOnly: true
- {{- end }}
- name: magnum-etc
mountPath: /etc/magnum/policy.yaml
subPath: policy.yaml
diff --git a/charts/magnum/values.yaml b/charts/magnum/values.yaml
index 7572095..91a5055 100644
--- a/charts/magnum/values.yaml
+++ b/charts/magnum/values.yaml
@@ -51,7 +51,23 @@
- image_repo_sync
conf:
- paste: {}
+ paste:
+ pipeline:main:
+ pipeline: cors healthcheck request_id authtoken api_v1
+ app:api_v1:
+ paste.app_factory: magnum.api.app:app_factory
+ filter:authtoken:
+ acl_public_routes: /, /v1
+ paste.filter_factory: magnum.api.middleware.auth_token:AuthTokenMiddleware.factory
+ filter:request_id:
+ paste.filter_factory: oslo_middleware:RequestId.factory
+ filter:cors:
+ paste.filter_factory: oslo_middleware.cors:filter_factory
+ oslo_config_project: magnum
+ filter:healthcheck:
+ paste.filter_factory: oslo_middleware:Healthcheck.factory
+ backends: disable_by_file
+ disable_by_file_path: /etc/magnum/healthcheck_disable
policy: {}
magnum:
DEFAULT: