diff --git a/hack/zarf-config-registry1.toml b/hack/zarf-config-registry1.toml index e58ec54df9..babd8ef731 100644 --- a/hack/zarf-config-registry1.toml +++ b/hack/zarf-config-registry1.toml @@ -6,7 +6,8 @@ architecture = "amd64" # The image reference to use for the Zarf agent, defaults to a locally built image agent_image_domain = "registry1.dso.mil/" agent_image = "ironbank/opensource/defenseunicorns/zarf/zarf-agent" -agent_image_tag = "local" +# renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/defenseunicorns/zarf/zarf-agent +agent_image_tag = "v0.32.6" # Tag for the zarf injector binary to use injector_version = "2023-08-02" @@ -16,7 +17,10 @@ injector_arm64_shasum = "663df681deea957b0ec53538eab221691a83de8e95d86b8a29008af # The image reference to use for the registry that Zarf deploys into the cluster registry_image_domain = "" registry_image = "library/registry" +# change this to use registry1 image when the image is available there - need alpha image for IRSA s3 backend access +# renovate: datasource=docker depName=docker.io/library/registry versioning=loose registry_image_tag = "3.0.0-alpha.1" # The image reference to use for the optional git-server Zarf deploys +# renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/go-gitea/gitea gitea_image = "registry1.dso.mil/ironbank/opensource/go-gitea/gitea:v1.21.5" diff --git a/renovate.json b/renovate.json deleted file mode 100644 index d8f6f4bb6b..0000000000 --- a/renovate.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "extends": [ - "config:base", - "group:allNonMajor" - ], - "ignoreDeps": [ - "sigs.k8s.io/kustomize/kyaml" - ], - "ignorePaths": [ - "**/node_modules/**", - "**/bower_components/**", - "**/vendor/**", - "**/__tests__/**", - "**/test/**", - "**/tests/**", - "**/__fixtures__/**" - ], - "packageRules": [ - { - "matchUpdateTypes": [ - "patch", - "pin", - "digest" - ], - "automerge": true, - "automergeType": "pr" - }, - { - "matchDepTypes": [ - "devDependencies" - ], - "automerge": true, - "automergeType": "pr" - } - ], - "platformAutomerge": true, - "platformCommit": true, - "postUpdateOptions": [ - "gomodTidy" - ], - "regexManagers": [ - { - "fileMatch": [ - "(^|/)zarf.yaml$" - ], - "matchStringsStrategy": "recursive", - "matchStrings": [ - "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", - "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-)", - "(?m)name: (?.+)(.|\\n)*?url: (?.+)(.|\\n)*?version: (?.+)" - ], - "datasourceTemplate": "helm" - }, - { - "fileMatch": [ - "(^|/)zarf.yaml$" - ], - "matchStringsStrategy": "recursive", - "matchStrings": [ - "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", - "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-)", - "(?m)name: (?.+)(.|\\n)*?version: (?.+)(.|\\n)*?url: (?.+)" - ], - "datasourceTemplate": "helm" - }, - { - "fileMatch": [ - "(^|/)zarf.yaml$" - ], - "matchStringsStrategy": "recursive", - "matchStrings": [ - "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( registryUrl=(?.*?))?\\s.*?version: (?.*)\\s" - ], - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" - }, - { - "fileMatch": [ - "(^|/)zarf.yaml$" - ], - "matchStringsStrategy": "recursive", - "matchStrings": [ - "https:\\/\\/github.com\\/(?[\\w\\/\\-\\.\\+\\%]+?)\\/releases\\/download\\/(?[\\w\\/\\-\\.\\+\\%]+?)\\/" - ], - "datasourceTemplate": "github-releases" - } - ] -} diff --git a/renovate.json5 b/renovate.json5 new file mode 100644 index 0000000000..3c7e1d805d --- /dev/null +++ b/renovate.json5 @@ -0,0 +1,112 @@ +{ + "extends": [ + "config:base", + "group:allNonMajor" + ], + "ignoreDeps": [ + "sigs.k8s.io/kustomize/kyaml" + ], + "ignorePaths": [ + "**/node_modules/**", + "**/bower_components/**", + "**/vendor/**", + "**/__tests__/**", + "**/test/**", + "**/tests/**", + "**/__fixtures__/**" + ], + "packageRules": [ + { + "matchUpdateTypes": [ + "patch", + "pin", + "digest" + ], + "automerge": true, + "automergeType": "pr" + }, + { + "matchDepTypes": [ + "devDependencies" + ], + "automerge": true, + "automergeType": "pr" + } + ], + "platformAutomerge": true, + "platformCommit": true, + "postUpdateOptions": [ + "gomodTidy" + ], + "hostRules": [ + { + "matchHost": "registry1.dso.mil", + "hostType": "docker", + "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", + "encrypted": { + "username": "wcFMA/xDdHCJBTolAQ//a+5GNAOsD/UOKnqJDdbPRr73EXRgyRdtMOIqDyjGZIKcdVo64StgUb1O37O5bazoyGeYkcISaWjInxRuoBOxqFhdo5cTUIJavjm2Sn75OWCDBUr2Q5/OSluQDbp7QO9g4+cHxcjtldlMswZg0RIoSX8rtAcNvJePvuWDKRHmUSDbWrNoAPaqOUvBIUF+BUR8o2UtKY4c986B9sqz1/ZiyL7vmenuoFi36MPpq123b6xra9/Q8Zb+AGZY6guhI0kmmSvLPwuNpU/W9ocpaUW1jOgJdYDowZqoTC27uozw1rCq38ybL94GMeG+pzWJd7LBVbfpDnU10j5UC5l5coxghh8dBYNzirsRbYW9KMV3CSeRNxOqfUuJ9AfWekCBWQMkueDtop+lzZhpvsPnXYTV6V0+TE+W5lg0wApcGUNM5XsEHV/gchSULZCWUTHpyZfkUoyc3dXax7K9LawrNLLpJg3Oz0c5Y4WXS1SqfY3U6n84Q95URZC+uRl5BqzBwQSQYbWsnon+g3My+GukdhHlynoiJwQo/ch5gIfgiA59VrL/H9L/ABAyYzQ7KUEguQrNh8hbNG0dfpMLMIrdUDhno5vTeccx2k5R/EOQopxZCY+k2Xfqgg5okAG9eQKhhGKcQD+A8y6X2V0cPkHQ35TCi5AObrcQiiemBZUy3G6IJIrSdQFEs+WcBPT4GPgOAsZWUJKU4RU3qdhdUGZy/VwJSsB05/E65fRTGl5i0e5PhIoIbh4uaPgWnbJyvKi87bIIJhe9bxP/m2lDs5GPeXSrvBb0GT3t9l3aHUYW3uKp5GABwmvX6ptMbNoYoQRSLptR/gE80RPFSQ", + "password": "wcFMA/xDdHCJBTolAQ//bu2ZFKmMysjpkOkwQSgLigvUMDw1SHpp1YN8y1LerOqMfTocdswihRFbB/FFRP/bYG1ByhnAvxqhbdV0TRQqYTRXZehrlT+SDEVEJyK9eGS+ozClbccG64ebZSJ4y9rMFW3sK4Ja9ZyAEsX0S4vO88XwJhtOYmMGTXLlcSfiANQB8a9jISzov27FQOzdPx6cEd19FGxmX5vAdH9FWDwhVA6QSTrip4h5tZ6THylNc3md2TGRYUVTxMtsZdp/bnhv+I3LqmodR0vEP9Or/dbhtqnMy2sdS6HsANUaZ+7j4D0qDL7EEcxk+CHM5lM2sSz6u4+J4u01XDkn0HJ/mShPDSWUoU01Va/ZpRL8zw/bjKApDBSgvBOwF7eXfUKqLrg2zURm2quUf7XwuVTXmBMg3DSEuRBlW8kM0rGWGyv7U62sx+2zjK0v2uNHJz0hzWaEfriOQu4B7/avb+CIupfVYGNllyMTuB2ySDMLKN3Q/EB7q97apWqwcnThxRhK7t3e59ea4JDxodxeeTG3m/UgBLBlXCutk7BsC7NQPaSeOzV7mw6AOVQz+Bn0DAGd1x03ITYAcgfYvSW7VCfhrvnmuSVICHA7GTYevC7RBYhexWdgHZb98mIt1vVA2C+h7eqsx+xWhHQFE2+lNRTRmj9ccU/6qz1+3zqHdMQ/WD8MLofSdgFLU/A7qljUm/dk1MEVMtGznukdRpJJV4PsEcwh2OV/9is5KPyFQ83M7sl3/fY+CBaHFEiT4j/bSBznmxL3TuAjMdIT7j0cNsOxnsHllgRHL1qG3S2ZmAQ0Ex4gIUUGn2VbZLyRogJspsjxx5ZYuuYVfhtSaTU" + } + } + ], + "regexManagers": [ + { + "fileMatch": [ + "(^|/)zarf.yaml$" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-)", + "(?m)name: (?.+)(.|\\n)*?url: (?.+)(.|\\n)*?version: (?.+)" + ], + "datasourceTemplate": "helm" + }, + { + "fileMatch": [ + "(^|/)zarf.yaml$" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-)", + "(?m)name: (?.+)(.|\\n)*?version: (?.+)(.|\\n)*?url: (?.+)" + ], + "datasourceTemplate": "helm" + }, + { + "fileMatch": [ + "(^|/)zarf.yaml$" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( registryUrl=(?.*?))?\\s.*?version: (?.*)\\s" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" + }, + { + "fileMatch": [ + "(^|/)zarf.yaml$" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "https:\\/\\/github.com\\/(?[\\w\\/\\-\\.\\+\\%]+?)\\/releases\\/download\\/(?[\\w\\/\\-\\.\\+\\%]+?)\\/" + ], + "datasourceTemplate": "github-releases" + }, + { + "fileMatch": [ + "(^|/)zarf-config.*.toml$" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + // Match version agent_image_tag in toml - Test: https://regex101.com/r/EwHOLD/1 + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( registryUrl=(?.*?))?\\s.*?agent_image_tag = (?.*)\\s", + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( registryUrl=(?.*?))?\\s.*?registry_image_tag = (?.*)\\s", + // Match whole string for gitea_image in toml - Test: https://regex101.com/r/2hxdIs/1 + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( registryUrl=(?.*?))?\\s.*?gitea_image = (?[^\\s]+)\\s" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" + } + ] +}