From ba6472643c85d7e7cc777d4ca3654f2a9f96b13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= <samip5@users.noreply.github.com>
Date: Wed, 22 Mar 2023 16:20:18 +0200
Subject: [PATCH] fix(manager/flux): the parsing of ocirepository (#21070)
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
---
lib/modules/manager/flux/extract.spec.ts | 8 ++++----
lib/modules/manager/flux/extract.ts | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/modules/manager/flux/extract.spec.ts b/lib/modules/manager/flux/extract.spec.ts
index 6e8b469463..f14307c3cc 100644
--- a/lib/modules/manager/flux/extract.spec.ts
+++ b/lib/modules/manager/flux/extract.spec.ts
@@ -43,7 +43,7 @@ describe('modules/manager/flux/extract', () => {
},
{
autoReplaceStringTemplate:
- '{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+ '{{#if newValue}}{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentDigest: undefined,
currentValue: 'v1.8.2',
datasource: DockerDatasource.id,
@@ -534,7 +534,7 @@ describe('modules/manager/flux/extract', () => {
deps: [
{
autoReplaceStringTemplate:
- '{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+ '{{#if newValue}}{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentValue: 'v1.8.2',
currentDigest: undefined,
depName: 'ghcr.io/kyverno/manifests/kyverno',
@@ -591,7 +591,7 @@ describe('modules/manager/flux/extract', () => {
deps: [
{
autoReplaceStringTemplate:
- '{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+ '{{#if newValue}}{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentDigest:
'sha256:761c3189c482d0f1f0ad3735ca05c4c398cae201d2169f6645280c7b7b2ce6fc',
currentValue: 'v1.8.2',
@@ -700,7 +700,7 @@ describe('modules/manager/flux/extract', () => {
deps: [
{
autoReplaceStringTemplate:
- '{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+ '{{#if newValue}}{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentDigest: undefined,
currentValue: 'v1.8.2',
depName: 'ghcr.io/kyverno/manifests/kyverno',
diff --git a/lib/modules/manager/flux/extract.ts b/lib/modules/manager/flux/extract.ts
index 41bc404242..a15f5aa486 100644
--- a/lib/modules/manager/flux/extract.ts
+++ b/lib/modules/manager/flux/extract.ts
@@ -224,7 +224,7 @@ function resolveResourceManifest(
} else if (resource.spec.ref?.tag) {
dep = getDep(`${container}:${resource.spec.ref.tag}`, false);
dep.autoReplaceStringTemplate =
- '{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}';
+ '{{#if newValue}}{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}';
dep.replaceString = resource.spec.ref.tag;
} else {
dep.skipReason = 'unversioned-reference';
--
GitLab