Skip to content

Commit

Permalink
fix(manager/flux): the parsing of ocirepository (#21070)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
  • Loading branch information
samip5 and viceice committed Mar 22, 2023
1 parent 875074f commit ba64726
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions lib/modules/manager/flux/extract.spec.ts
Expand Up @@ -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,
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/flux/extract.ts
Expand Up @@ -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';
Expand Down

0 comments on commit ba64726

Please sign in to comment.