diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index eb7a7267e..7827113ed 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -434,12 +434,12 @@ resources: - license_path: LICENSE ref: v${image_tag} url: https://github.com/TremoloSecurity/kube-oidc-proxy - - container_image: quay.io/kiali/kiali-operator:v1.89.7 + - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/kiali/kiali-operator:v2.1.0-d2iq.0 sources: - license_path: LICENSE - ref: ${image_tag} + ref: ${image_tag%-d2iq.0} url: https://github.com/kiali/kiali-operator - - container_image: quay.io/kiali/kiali:v1.88.0-distro + - container_image: quay.io/kiali/kiali:v2.1.0-distro sources: - license_path: LICENSE ref: ${image_tag%-distro} diff --git a/services/kiali/1.89.7/extra-images.txt b/services/kiali/1.89.7/extra-images.txt deleted file mode 100644 index 50716194b..000000000 --- a/services/kiali/1.89.7/extra-images.txt +++ /dev/null @@ -1 +0,0 @@ -quay.io/kiali/kiali:v1.88.0-distro diff --git a/services/kiali/1.89.7/defaults/cm.yaml b/services/kiali/2.1.0/defaults/cm.yaml similarity index 93% rename from services/kiali/1.89.7/defaults/cm.yaml rename to services/kiali/2.1.0/defaults/cm.yaml index 4b26a13b9..764471755 100644 --- a/services/kiali/1.89.7/defaults/cm.yaml +++ b/services/kiali/2.1.0/defaults/cm.yaml @@ -1,14 +1,14 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kiali-1.89.7-d2iq-defaults + name: kiali-2.1.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | priorityClassName: dkp-high-priority image: - repo: quay.io/kiali/kiali-operator - tag: v1.89.7 + repo: ghcr.io/mesosphere/dkp-container-images/quay.io/kiali/kiali-operator + tag: v2.1.0-d2iq.0 allowAdHocKialiImage: true cr: create: true diff --git a/services/kiali/1.89.7/defaults/kustomization.yaml b/services/kiali/2.1.0/defaults/kustomization.yaml similarity index 100% rename from services/kiali/1.89.7/defaults/kustomization.yaml rename to services/kiali/2.1.0/defaults/kustomization.yaml diff --git a/services/kiali/2.1.0/extra-images.txt b/services/kiali/2.1.0/extra-images.txt new file mode 100644 index 000000000..cf8f77e4e --- /dev/null +++ b/services/kiali/2.1.0/extra-images.txt @@ -0,0 +1 @@ +quay.io/kiali/kiali:v2.1.0-distro diff --git a/services/kiali/1.89.7/kiali.yaml b/services/kiali/2.1.0/kiali.yaml similarity index 96% rename from services/kiali/1.89.7/kiali.yaml rename to services/kiali/2.1.0/kiali.yaml index c9f5a7a86..9f3b70ea1 100644 --- a/services/kiali/1.89.7/kiali.yaml +++ b/services/kiali/2.1.0/kiali.yaml @@ -16,7 +16,7 @@ spec: kind: HelmRepository name: kiali-org namespace: kommander-flux - version: 1.89.7 + version: 2.1.0 interval: 15s install: crds: CreateReplace @@ -29,7 +29,7 @@ spec: releaseName: kiali valuesFrom: - kind: ConfigMap - name: kiali-1.89.7-d2iq-defaults + name: kiali-2.1.0-d2iq-defaults targetNamespace: istio-system --- apiVersion: v1 diff --git a/services/kiali/1.89.7/kustomization.yaml b/services/kiali/2.1.0/kustomization.yaml similarity index 100% rename from services/kiali/1.89.7/kustomization.yaml rename to services/kiali/2.1.0/kustomization.yaml