diff --git a/openstack/ironic/Chart.yaml b/openstack/ironic/Chart.yaml index ee007c4fccc..f2e1a57187e 100644 --- a/openstack/ironic/Chart.yaml +++ b/openstack/ironic/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: A Helm chart for Kubernetes icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png name: ironic -version: 0.2.18 +version: 0.2.19 dependencies: - condition: mariadb.enabled name: mariadb diff --git a/openstack/ironic/templates/seed.yaml b/openstack/ironic/templates/seed.yaml index d6fb04daa81..593ba3bfcb0 100644 --- a/openstack/ironic/templates/seed.yaml +++ b/openstack/ironic/templates/seed.yaml @@ -657,7 +657,6 @@ spec: # cc3test does not get seeds # ccadmin gets role assignments for the master project and some additional project assignments # monsoon3 gets a special role assignment for cc-demo project - # s4 gets a special role assignment for S4_CFM_ADMINS group # iaas is excluded completely domains: @@ -711,13 +710,6 @@ spec: - project: cc-demo role: baremetal_admin {{- end }} - {{- if eq . "s4"}} - - name: S4_CFM_ADMINS - role_assignments: - - domain: s4 - role: cloud_baremetal_admin - inherited: true - {{- end }} - name: {{ hasPrefix "iaas-" . | ternary . ( upper . ) }}_API_SUPPORT role_assignments: {{- if not (has . $cdomainsWithoutSupportProjects) }} diff --git a/openstack/utils/Chart.yaml b/openstack/utils/Chart.yaml index d34ac5373b6..e71850697cb 100644 --- a/openstack/utils/Chart.yaml +++ b/openstack/utils/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: A Helm chart for Kubernetes name: utils -version: 0.38.1 +version: 0.38.2 diff --git a/openstack/utils/templates/_hosts.tpl b/openstack/utils/templates/_hosts.tpl index fd09f08ab23..b1b6d2a45ea 100644 --- a/openstack/utils/templates/_hosts.tpl +++ b/openstack/utils/templates/_hosts.tpl @@ -349,8 +349,6 @@ Custom DB URL for the global services using percona_cluster {{define "swift_endpoint_host"}}objectstore-3.{{ include "host_fqdn" . }}{{end}} -{{define "cfm_api_endpoint_host_public"}}cfm.{{ include "host_fqdn" . }}{{end}} - {{define "sftp_api_endpoint_host"}}sftp-bridge.{{ .Values.global.region }}.{{ .Values.global.tld }}{{end}} {{ define "f5_url" }} diff --git a/system/kube-monitoring-metal/Chart.yaml b/system/kube-monitoring-metal/Chart.yaml index 8ee3a8803a8..b3146fd8213 100644 --- a/system/kube-monitoring-metal/Chart.yaml +++ b/system/kube-monitoring-metal/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.0" description: Kubernetes metal controlplane monitoring. name: kube-monitoring-metal -version: 4.11.7 +version: 4.11.8 home: https://github.com/sapcc/helm-charts/tree/master/system/kube-monitoring-metal dependencies: - condition: absent-metrics-operator.enabled diff --git a/system/kube-monitoring-metal/values.yaml b/system/kube-monitoring-metal/values.yaml index d31f0bf1a44..1e95e31c66d 100644 --- a/system/kube-monitoring-metal/values.yaml +++ b/system/kube-monitoring-metal/values.yaml @@ -98,9 +98,6 @@ prober-static-alt-region: prometheusName: kubernetes http-keep-alive-monitor: - alert: - ignore_ingress_names: - - cfm image: repository: keppel.global.cloud.sap/ccloud/http-keep-alive-monitor