From c637116d500859efb35f9f928b391204d9f08808 Mon Sep 17 00:00:00 2001
From: Sean Melissari <Melissari_Sean@bah.com>
Date: Wed, 17 Jun 2020 14:09:36 -0400
Subject: [PATCH 1/3] add renovate

---
 Dockerfile    | 32 +++++++++++++-------------------
 Jenkinsfile   |  2 +-
 README.md     |  1 -
 download.yaml |  2 +-
 renovate.json | 22 ++++++++++++++++++++++
 5 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 renovate.json

diff --git a/Dockerfile b/Dockerfile
index 3ff169c..9e344cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,22 @@
-###############################################################
-# Default registry variables
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
-###############################################################
-# Copy mixer contents to base image
-FROM opensource/istio-1.6/istioctl-1.6/istioctl:1.6.1 AS base
+
+FROM istio/istioctl:1.6.1 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-###############################################################
-# Provide label information
-LABEL name="istio-istioctl" \
-      maintainer="cody.hutchins@darkwolf.co" \
-      vendor="Open Source" \
-      version="1.6.1" \
-      release="1" \
-      summary="Istio configuration command line utility" \
-      description="Istio configuration command line utility for service operators to debug and diagnose their Istio mesh."
-###############################################################
-# untar istioctl. Then copy the executable to /usr/local/bin
+
+LABEL org.opencontainers.image.title="istioctl" \
+      org.opencontainers.image.description="Istio configuration command line utility." \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.url="https://istio.io" \
+      org.opencontainers.image.version="1.6.1" \
+      maintainer="cht@dsop.io"
+
 COPY --from=base /usr/local/bin/istioctl /usr/local/bin/istioctl
 
-###############################################################
-# Run as another user, provide healthcheck, and set entrypoint
 USER 1000
+
 HEALTHCHECK --interval=1m --start-period=30s CMD version --remote=false
-ENTRYPOINT ["/usr/local/bin/istioctl"]
\ No newline at end of file
+
+ENTRYPOINT ["/usr/local/bin/istioctl"]
diff --git a/Jenkinsfile b/Jenkinsfile
index c536db0..8916a84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline( version: "1.6.1")
\ No newline at end of file
+dccscrPipeline(version: "1.6.1")
diff --git a/README.md b/README.md
index b6b2330..bb9bdf8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # istioctl
-Version 1.6.1
 
 istioctl allows you to install and configure an Istio mesh for production use or for evaluation purposes. istioctl is a command line tool which provides customization of the Istio control plane and of the sidecars for the Istio data plane. It has user input validation to help prevent installation errors and customization options to override any aspect of the configuration.
 
diff --git a/download.yaml b/download.yaml
index 92aa0e0..f14096e 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,4 +1,4 @@
 ---
 resources:
   - url: "docker://docker.io/istio/istioctl@sha256:090478dfa99e1779f0a90a83587229afda16cacf21621ef126dee95507d2f3d4"
-    tag: "opensource/istio-1.6/istioctl-1.6/istioctl:1.6.1"
+    tag: "istio/istioctl:1.6.1"
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..768e56c
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,22 @@
+{
+  "assignees": ["@gavin.scallon"],
+  "baseBranches": ["development"],
+  "regexManagers": [
+    {
+      "fileMatch": ["^Dockerfile$"],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/istioctl",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^Jenkinsfile$"],
+      "matchStrings": [
+        "version:\\s+\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/istioctl",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}
-- 
GitLab


From 968f6b759df9e34b9520692588dee485e3845adb Mon Sep 17 00:00:00 2001
From: Sean Melissari <Melissari_Sean@bah.com>
Date: Wed, 17 Jun 2020 16:22:32 -0400
Subject: [PATCH 2/3] disable minor updates

---
 renovate.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/renovate.json b/renovate.json
index 768e56c..94c87ce 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,6 +1,9 @@
 {
   "assignees": ["@gavin.scallon"],
   "baseBranches": ["development"],
+  "minor": {
+    "enabled": false
+  },
   "regexManagers": [
     {
       "fileMatch": ["^Dockerfile$"],
-- 
GitLab


From a8fd1ff654430fd7e6450872694808a37fa701b4 Mon Sep 17 00:00:00 2001
From: Sean Melissari <Melissari_Sean@bah.com>
Date: Thu, 18 Jun 2020 09:49:24 -0400
Subject: [PATCH 3/3] fix minor upgrades

---
 renovate.json | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/renovate.json b/renovate.json
index 94c87ce..8dc814e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,9 +1,16 @@
 {
   "assignees": ["@gavin.scallon"],
   "baseBranches": ["development"],
-  "minor": {
-    "enabled": false
-  },
+  "packageRules": [
+    {
+      "datasources": ["docker"],
+      "packageNames": ["istio/istioctl"],
+      "separateMinorPatch": true,
+      "minor": {
+        "enabled": false
+      }
+    }
+  ],
   "regexManagers": [
     {
       "fileMatch": ["^Dockerfile$"],
-- 
GitLab