diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index a64805e9a7..8f53686ca8 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -20,12 +20,6 @@ resources: - license_path: LICENSE ref: v${image_tag%-debian-12-r0} url: https://github.com/thanos-io/thanos - - container_image: ghcr.io/mesosphere/dkp-container-images/docker.io/grafana/grafana:10.3.3-d2iq.0 - sources: - - license_path: LICENSE - notice_path: NOTICE.md - ref: v${image_tag%-d2iq.0} - url: https://github.com/grafana/grafana - container_image: docker.io/grafana/grafana:11.2.2-security-01 sources: - license_path: LICENSE @@ -460,12 +454,6 @@ 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.79.2 sources: - license_path: LICENSE @@ -584,18 +572,23 @@ resources: - url: https://github.com/mirror/busybox ref: master license_path: LICENSE - - container_image: gcr.io/kubecost1/cost-model:prod-1.108.1 + - container_image: gcr.io/kubecost1/cost-model:prod-2.5.0 sources: - url: https://github.com/opencost/opencost - ref: v${image_tag#prod-} + ref: v1.112.1 license_path: LICENSE - - container_image: ghcr.io/mesosphere/dkp-container-images/gcr.io/kubecost1/frontend:prod-1.108.1-d2iq.0 + - container_image: gcr.io/kubecost1/frontend:prod-2.5.0 sources: - url: https://github.com/opencost/opencost - ref: v1.108.1 + ref: v1.112.1 license_path: LICENSE - container_image: registry.k8s.io/pause:3.10 sources: - url: https://github.com/kubernetes/kubernetes ref: master license_path: LICENSE + - container_image: gcr.io/k8s-staging-sig-storage/objectstorage-controller:v20221027-v0.1.1-8-g300019f # TODO(takirala): drop this entry after merging https://github.com/mesosphere/konvoy2/pull/3474 + sources: + - url: https://github.com/kubernetes-sigs/container-object-storage-interface + ref: main + license_path: LICENSE diff --git a/services/centralized-grafana/65.5.0/defaults/cm.yaml b/services/centralized-grafana/65.5.0/defaults/cm.yaml index 539bf5a7ef..0256d50c67 100644 --- a/services/centralized-grafana/65.5.0/defaults/cm.yaml +++ b/services/centralized-grafana/65.5.0/defaults/cm.yaml @@ -41,7 +41,7 @@ data: skipReload: true initDatasources: true annotations: - configmap.reloader.stakater.com/reload: "centralized-kubecost-grafana-datasource" + configmap.reloader.stakater.com/reload: "kubecost-grafana-datasource" ingress: enabled: true annotations: diff --git a/services/kommander/0.14.0/defaults/cm.yaml b/services/kommander/0.14.0/defaults/cm.yaml index 5bd7c0560e..cd2d770d59 100644 --- a/services/kommander/0.14.0/defaults/cm.yaml +++ b/services/kommander/0.14.0/defaults/cm.yaml @@ -67,9 +67,7 @@ data: tag: ${kommanderLicensingControllerWebhookImageTag} repository: ${kommanderLicensingControllerWebhookImageRepository} defaultEnterpriseApps: - - "centralized-kubecost" - "kubecost" - - "kubecost-thanos-traefik" - "centralized-grafana" - "karma" - "karma-traefik" @@ -97,7 +95,7 @@ data: - "ai-navigator-app" - "ai-navigator-cluster-info-agent" - "centralized-grafana" - - "centralized-kubecost" + - "kubecost" - "chartmuseum" - "dex" - "dex-k8s-authenticator" @@ -122,7 +120,6 @@ data: - "kube-prometheus-stack" - "prometheus-adapter" - "prometheus-thanos-traefik" - - "kubecost-thanos-traefik" - "cert-manager" - "karma-traefik" - "gatekeeper" diff --git a/services/nkp-insights/1.3.4/defaults/cm.yaml b/services/nkp-insights/1.3.4/defaults/cm.yaml index eb4b3e643b..33c605e019 100644 --- a/services/nkp-insights/1.3.4/defaults/cm.yaml +++ b/services/nkp-insights/1.3.4/defaults/cm.yaml @@ -59,7 +59,7 @@ data: groupKind: group: kustomize.toolkit.fluxcd.io kind: Kustomization - nameRegexp: ai-navigator-app|ai-navigator-cluster-info-agent|centralized-grafana|centralized-kubecost|cert-manager|chartmuseum|dex|dex-k8s-authenticator|external-dns|fluent-bit|gatekeeper|git-operator|grafana-logging|grafana-loki|istio|jaeger|karma|karma-traefik|kiali|knative|kommander|kommander-appmanagement|kommander-flux|kommander-ui|kube-oidc-proxy|kube-prometheus-stack|kubecost|kubecost-thanos-traefik|kubefed|kubernetes-dashboard|kubetunnel|logging-operator|nkp-insights|nkp-insights-management|nvidia-gpu-operator|project-grafana-logging|project-grafana-loki|project-logging|prometheus-adapter|prometheus-thanos-traefik|reloader|rook-ceph|rook-ceph-cluster|thanos|traefik|traefik-forward-auth|traefik-forward-auth-mgmt|velero|kafka-operator|zookeeper-operator + nameRegexp: ai-navigator-app|ai-navigator-cluster-info-agent|centralized-grafana|cert-manager|chartmuseum|dex|dex-k8s-authenticator|external-dns|fluent-bit|gatekeeper|git-operator|grafana-logging|grafana-loki|istio|jaeger|karma|karma-traefik|kiali|knative|kommander|kommander-appmanagement|kommander-flux|kommander-ui|kube-oidc-proxy|kube-prometheus-stack|kubecost|kubecost-thanos-traefik|kubefed|kubernetes-dashboard|kubetunnel|logging-operator|nkp-insights|nkp-insights-management|nvidia-gpu-operator|project-grafana-logging|project-grafana-loki|project-logging|prometheus-adapter|prometheus-thanos-traefik|reloader|rook-ceph|rook-ceph-cluster|thanos|traefik|traefik-forward-auth|traefik-forward-auth-mgmt|velero|kafka-operator|zookeeper-operator Kustomization-kommander-non-app: groupKind: group: kustomize.toolkit.fluxcd.io