diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b6e6cd9d9a1c8d35df475e8d0091fe0eddf6cc94..54dd76854ae60f6b32b44bbed2379cf05e52a358 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.18/kube-proxy-1.18" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v1.18.19" +- "v1.18.20" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://kubernetes.io/" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "opensource" - org.opencontainers.image.version: "v1.18.19" + org.opencontainers.image.version: "v1.18.20" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "kubernetes" ## This value can be "opensource" or "commercial" @@ -37,11 +37,11 @@ labels: # List of resources to make available to the offline build context resources: -- url: https://github.com/kubernetes/kubernetes/archive/v1.18.19.tar.gz +- url: https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz filename: kubernetes.tar.gz validation: type: sha256 - value: 2812e4c0b66fe5efe588c6affdb6c0e180e8649dadacb5144511feb398f2001e + value: 45bcf77fb5beb52aa2ecb22594193938cecf033b1e9409ad1cd0f7af15f32e3b - filename: texinfo.tar.gz url: "https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz" validation: diff --git a/renovate.json b/renovate.json index 0b66c5fd66bb3cda1cf309a73298a47f195bfe65..823b11ea2c1c28b2985b71e28fd8f23ce5007d93 100644 --- a/renovate.json +++ b/renovate.json @@ -5,10 +5,12 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "packageRules": [ { "datasources": [ - "github-releases" + "github-tags" ], "packageNames": [ "kubernetes/kubernetes" @@ -20,35 +22,16 @@ } ], "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "kubernetes/kubernetes", - "datasourceTemplate": "github-releases" - }, - { - "fileMatch": [ - "^hardening_manifest.yaml$" - ], - "matchStrings": [ - "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" - ], - "depNameTemplate": "kubernetes/kubernetes", - "datasourceTemplate": "github-releases" - }, { "fileMatch": [ "^hardening_manifest.yaml$" ], "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"", "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "kubernetes/kubernetes", - "datasourceTemplate": "github-releases" + "datasourceTemplate": "github-tags" } ] -} \ No newline at end of file +}