diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index bff2ea6a57dbe277870ea25058df00ec3398401e..a3670a56eb4ea6252f5b8db89decc874fb3164e1 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.20/kube-scheduler-1.20" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v1.20.7" +- "v1.20.8" - "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.20.7" + org.opencontainers.image.version: "v1.20.8" ## 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.20.7.tar.gz +- url: https://github.com/kubernetes/kubernetes/archive/v1.20.8.tar.gz filename: kubernetes.tar.gz validation: type: sha256 - value: 3e4e698e142dbbdc6a5c84b140eb20477a4e0da1903395d59de84d0d254ae7fd + value: c5b0a01d7359982fd18369b70e0a80fae3d938a5f0ae4eda262b71b42fbd7db5 - filename: go1.15.8.linux-amd64.tar.gz url: https://golang.org/dl/go1.15.8.linux-amd64.tar.gz validation: diff --git a/renovate.json b/renovate.json index 97a8c4a4171eca62f5bc623177d1880d2baee35b..0d4816239ee36a355b16d61c1b443dd1c767aece 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 +}