From e6a1cbcd9f6e4fb9a7eb121258057c220d0ed82b Mon Sep 17 00:00:00 2001
From: Jamie Magee <JamieMagee@users.noreply.github.com>
Date: Thu, 8 Oct 2020 22:05:56 +0200
Subject: [PATCH] fix(kustomize): set docker versioning (#7432)

Fixes #7431
---
 lib/manager/kustomize/__snapshots__/extract.spec.ts.snap | 5 +++++
 lib/manager/kustomize/extract.spec.ts                    | 6 ++++++
 lib/manager/kustomize/extract.ts                         | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/lib/manager/kustomize/__snapshots__/extract.spec.ts.snap b/lib/manager/kustomize/__snapshots__/extract.spec.ts.snap
index 9673b8dcaf..dc1b88f0a5 100644
--- a/lib/manager/kustomize/__snapshots__/extract.spec.ts.snap
+++ b/lib/manager/kustomize/__snapshots__/extract.spec.ts.snap
@@ -79,26 +79,31 @@ Array [
     "currentValue": "v0.1.0",
     "datasource": "docker",
     "depName": "node",
+    "versioning": "docker",
   },
   Object {
     "currentValue": "v0.0.1",
     "datasource": "docker",
     "depName": "group/instance",
+    "versioning": "docker",
   },
   Object {
     "currentValue": "v0.0.2",
     "datasource": "docker",
     "depName": "quay.io/test/repo",
+    "versioning": "docker",
   },
   Object {
     "currentValue": "v0.0.3",
     "datasource": "docker",
     "depName": "gitlab.com/org/suborg/image",
+    "versioning": "docker",
   },
   Object {
     "currentValue": "v0.0.4",
     "datasource": "docker",
     "depName": "but.this.lives.on.local/private-registry",
+    "versioning": "docker",
   },
 ]
 `;
diff --git a/lib/manager/kustomize/extract.spec.ts b/lib/manager/kustomize/extract.spec.ts
index 8e98db15ca..5c6eb4ed4c 100644
--- a/lib/manager/kustomize/extract.spec.ts
+++ b/lib/manager/kustomize/extract.spec.ts
@@ -2,6 +2,7 @@ import { readFileSync } from 'fs';
 import * as datasourceDocker from '../../datasource/docker';
 import * as datasourceGitTags from '../../datasource/git-tags';
 import * as datasourceGitHubTags from '../../datasource/github-tags';
+import * as dockerVersioning from '../../versioning/docker';
 import {
   extractBase,
   extractImage,
@@ -129,6 +130,7 @@ describe('manager/kustomize/extract', () => {
       const sample = {
         currentValue: 'v1.0.0',
         datasource: datasourceDocker.id,
+        versioning: dockerVersioning.id,
         depName: 'node',
       };
       const pkg = extractImage({
@@ -141,6 +143,7 @@ describe('manager/kustomize/extract', () => {
       const sample = {
         currentValue: 'v1.0.0',
         datasource: datasourceDocker.id,
+        versioning: dockerVersioning.id,
         depName: 'test/node',
       };
       const pkg = extractImage({
@@ -153,6 +156,7 @@ describe('manager/kustomize/extract', () => {
       const sample = {
         currentValue: 'v1.0.0',
         datasource: datasourceDocker.id,
+        versioning: dockerVersioning.id,
         depName: 'quay.io/repo/image',
       };
       const pkg = extractImage({
@@ -165,6 +169,7 @@ describe('manager/kustomize/extract', () => {
       const sample = {
         currentValue: 'v1.0.0',
         datasource: datasourceDocker.id,
+        versioning: dockerVersioning.id,
         depName: 'localhost:5000/repo/image',
       };
       const pkg = extractImage({
@@ -177,6 +182,7 @@ describe('manager/kustomize/extract', () => {
       const sample = {
         currentValue: 'v1.0.0',
         datasource: datasourceDocker.id,
+        versioning: dockerVersioning.id,
         depName: 'localhost:5000/repo/image/service',
       };
       const pkg = extractImage({
diff --git a/lib/manager/kustomize/extract.ts b/lib/manager/kustomize/extract.ts
index 1ace5c0175..ea4861ef28 100644
--- a/lib/manager/kustomize/extract.ts
+++ b/lib/manager/kustomize/extract.ts
@@ -3,6 +3,7 @@ import * as datasourceDocker from '../../datasource/docker';
 import * as datasourceGitTags from '../../datasource/git-tags';
 import * as datasourceGitHubTags from '../../datasource/github-tags';
 import { logger } from '../../logger';
+import * as dockerVersioning from '../../versioning/docker';
 import { PackageDependency, PackageFile } from '../common';
 
 interface Image {
@@ -66,6 +67,7 @@ export function extractImage(image: Image): PackageDependency | null {
   if (image?.name && image.newTag) {
     return {
       datasource: datasourceDocker.id,
+      versioning: dockerVersioning.id,
       depName: image.newName ?? image.name,
       currentValue: image.newTag,
     };
-- 
GitLab