diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 1e09ef6b5..fa33b1ef3 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -66,11 +66,6 @@ resources: - license_path: LICENSE ref: v${image_tag} url: https://github.com/jaegertracing/jaeger-operator - - container_image: ghcr.io/jimmidyson/configmap-reload:v0.14.0 - sources: - - license_path: LICENSE.txt - ref: ${image_tag} - url: https://github.com/jimmidyson/configmap-reload - container_image: docker.io/kiwigrid/k8s-sidecar:1.28.0 sources: - license_path: LICENSE @@ -439,6 +434,12 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus-operator/prometheus-operator + - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.69.1 + sources: + - license_path: LICENSE + notice_path: NOTICE + ref: ${image_tag} + url: https://github.com/prometheus-operator/prometheus-operator - container_image: quay.io/prometheus-operator/prometheus-operator:v0.77.2 sources: - license_path: LICENSE @@ -551,15 +552,15 @@ resources: - url: https://github.com/mirror/busybox ref: master license_path: LICENSE - - container_image: gcr.io/kubecost1/cost-model:prod-1.106.7 + - container_image: gcr.io/kubecost1/cost-model:prod-1.108.1 sources: - url: https://github.com/opencost/opencost ref: v${image_tag#prod-} license_path: LICENSE - - container_image: ghcr.io/mesosphere/dkp-container-images/gcr.io/kubecost1/frontend:prod-1.106.7-d2iq.1 + - container_image: gcr.io/kubecost1/frontend:prod-1.108.1 sources: - url: https://github.com/opencost/opencost - ref: v1.106.7 + ref: v1.108.1 license_path: LICENSE - container_image: registry.k8s.io/pause:3.10 sources: diff --git a/services/centralized-kubecost/0.37.6/defaults/cm.yaml b/services/centralized-kubecost/0.37.7/defaults/cm.yaml similarity index 96% rename from services/centralized-kubecost/0.37.6/defaults/cm.yaml rename to services/centralized-kubecost/0.37.7/defaults/cm.yaml index ccda13062..16013bee4 100644 --- a/services/centralized-kubecost/0.37.6/defaults/cm.yaml +++ b/services/centralized-kubecost/0.37.7/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: centralized-kubecost-0.37.6-d2iq-defaults + name: centralized-kubecost-0.37.7-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -13,12 +13,11 @@ data: cost-analyzer: fullnameOverride: "kommander-kubecost-cost-analyzer" - kubecostFrontend: - fullImageName: ghcr.io/mesosphere/dkp-container-images/gcr.io/kubecost1/frontend:prod-1.106.7-d2iq.1 priority: enabled: true name: dkp-high-priority - + diagnostics: + enabled: false global: prometheus: fqdn: http://kubecost-prometheus-server.kommander.svc.cluster.local diff --git a/services/centralized-kubecost/0.37.6/defaults/kustomization.yaml b/services/centralized-kubecost/0.37.7/defaults/kustomization.yaml similarity index 100% rename from services/centralized-kubecost/0.37.6/defaults/kustomization.yaml rename to services/centralized-kubecost/0.37.7/defaults/kustomization.yaml diff --git a/services/centralized-kubecost/0.37.6/kustomization.yaml b/services/centralized-kubecost/0.37.7/kustomization.yaml similarity index 100% rename from services/centralized-kubecost/0.37.6/kustomization.yaml rename to services/centralized-kubecost/0.37.7/kustomization.yaml diff --git a/services/centralized-kubecost/0.37.6/post-install-jobs.yaml b/services/centralized-kubecost/0.37.7/post-install-jobs.yaml similarity index 88% rename from services/centralized-kubecost/0.37.6/post-install-jobs.yaml rename to services/centralized-kubecost/0.37.7/post-install-jobs.yaml index 4b34a9032..ee710643a 100644 --- a/services/centralized-kubecost/0.37.6/post-install-jobs.yaml +++ b/services/centralized-kubecost/0.37.7/post-install-jobs.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/centralized-kubecost/0.37.6/post-install-jobs + path: ./services/centralized-kubecost/0.37.7/post-install-jobs dependsOn: - name: centralized-kubecost-release sourceRef: diff --git a/services/centralized-kubecost/0.37.6/post-install-jobs/post-install-jobs.yaml b/services/centralized-kubecost/0.37.7/post-install-jobs/post-install-jobs.yaml similarity index 100% rename from services/centralized-kubecost/0.37.6/post-install-jobs/post-install-jobs.yaml rename to services/centralized-kubecost/0.37.7/post-install-jobs/post-install-jobs.yaml diff --git a/services/centralized-kubecost/0.37.6/release.yaml b/services/centralized-kubecost/0.37.7/release.yaml similarity index 88% rename from services/centralized-kubecost/0.37.6/release.yaml rename to services/centralized-kubecost/0.37.7/release.yaml index 8537492a4..b1fd6b907 100644 --- a/services/centralized-kubecost/0.37.6/release.yaml +++ b/services/centralized-kubecost/0.37.7/release.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/centralized-kubecost/0.37.6/release + path: ./services/centralized-kubecost/0.37.7/release sourceRef: kind: GitRepository name: management diff --git a/services/centralized-kubecost/0.37.6/release/release.yaml b/services/centralized-kubecost/0.37.7/release/release.yaml similarity index 98% rename from services/centralized-kubecost/0.37.6/release/release.yaml rename to services/centralized-kubecost/0.37.7/release/release.yaml index 729dd933b..26d1356bd 100644 --- a/services/centralized-kubecost/0.37.6/release/release.yaml +++ b/services/centralized-kubecost/0.37.7/release/release.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-stable namespace: kommander-flux - version: 0.37.3 + version: 0.37.4 interval: 15s install: crds: CreateReplace @@ -25,7 +25,7 @@ spec: releaseName: centralized-kubecost valuesFrom: - kind: ConfigMap - name: centralized-kubecost-0.37.6-d2iq-defaults + name: centralized-kubecost-0.37.7-d2iq-defaults targetNamespace: kubecost --- apiVersion: v1 diff --git a/services/kubecost/0.37.7/defaults/cm.yaml b/services/kubecost/0.37.8/defaults/cm.yaml similarity index 90% rename from services/kubecost/0.37.7/defaults/cm.yaml rename to services/kubecost/0.37.8/defaults/cm.yaml index 7d6a1dfd3..efdc334ca 100644 --- a/services/kubecost/0.37.7/defaults/cm.yaml +++ b/services/kubecost/0.37.8/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kubecost-0.37.7-d2iq-defaults + name: kubecost-0.37.8-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -12,12 +12,11 @@ data: priorityClassName: dkp-high-priority cost-analyzer: - kubecostFrontend: - fullImageName: ghcr.io/mesosphere/dkp-container-images/gcr.io/kubecost1/frontend:prod-1.106.7-d2iq.1 priority: enabled: true name: dkp-high-priority - + diagnostics: + enabled: false global: prometheus: enabled: true @@ -85,15 +84,6 @@ data: image: repository: quay.io/prometheus/alertmanager tag: v0.27.0 - configmapReload: - prometheus: - image: - repository: ghcr.io/jimmidyson/configmap-reload - tag: v0.14.0 - alertmanager: - image: - repository: ghcr.io/jimmidyson/configmap-reload - tag: v0.14.0 grafana: priorityClassName: dkp-high-priority image: diff --git a/services/kubecost/0.37.7/defaults/kustomization.yaml b/services/kubecost/0.37.8/defaults/kustomization.yaml similarity index 100% rename from services/kubecost/0.37.7/defaults/kustomization.yaml rename to services/kubecost/0.37.8/defaults/kustomization.yaml diff --git a/services/kubecost/0.37.7/kubecost.yaml b/services/kubecost/0.37.8/kubecost.yaml similarity index 96% rename from services/kubecost/0.37.7/kubecost.yaml rename to services/kubecost/0.37.8/kubecost.yaml index eb935f6e4..056b47757 100644 --- a/services/kubecost/0.37.7/kubecost.yaml +++ b/services/kubecost/0.37.8/kubecost.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-stable namespace: kommander-flux - version: 0.37.3 + version: 0.37.4 interval: 15s install: crds: CreateReplace @@ -25,7 +25,7 @@ spec: releaseName: kubecost valuesFrom: - kind: ConfigMap - name: kubecost-0.37.7-d2iq-defaults + name: kubecost-0.37.8-d2iq-defaults targetNamespace: ${releaseNamespace} --- apiVersion: v1 diff --git a/services/kubecost/0.37.7/kustomization.yaml b/services/kubecost/0.37.8/kustomization.yaml similarity index 100% rename from services/kubecost/0.37.7/kustomization.yaml rename to services/kubecost/0.37.8/kustomization.yaml