From 1c2c18697d0b28d27c4b1c95ade3c3cb0d1c5c57 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 27 Apr 2026 13:16:02 +1000 Subject: [PATCH] feat: update artifactapi to 2.3.0 (#91) - update to mutable/immutable ttl/patterns - reoganised paths to correct patterns Reviewed-on: https://git.unkin.net/unkin/argocd-apps/pulls/91 --- .../artifactapi/artifactapi-deployment.yaml | 2 +- apps/base/artifactapi/resources/remotes.yaml | 169 +++++++++--------- 2 files changed, 85 insertions(+), 86 deletions(-) diff --git a/apps/base/artifactapi/artifactapi-deployment.yaml b/apps/base/artifactapi/artifactapi-deployment.yaml index f6fb8d7..fd427bd 100644 --- a/apps/base/artifactapi/artifactapi-deployment.yaml +++ b/apps/base/artifactapi/artifactapi-deployment.yaml @@ -19,7 +19,7 @@ spec: automountServiceAccountToken: true containers: - name: artifactapi - image: git.unkin.net/unkin/artifactapi:v2.2.1 + image: git.unkin.net/unkin/artifactapi:v2.3.0 imagePullPolicy: IfNotPresent ports: - containerPort: 8000 diff --git a/apps/base/artifactapi/resources/remotes.yaml b/apps/base/artifactapi/resources/remotes.yaml index 65d8415..a1727ed 100644 --- a/apps/base/artifactapi/resources/remotes.yaml +++ b/apps/base/artifactapi/resources/remotes.yaml @@ -4,10 +4,9 @@ remotes: type: "remote" package: "generic" description: "GitHub releases and files" - include_patterns: - # GitHub repository archive tarballs (branches and tags) - - ".*/archive/refs/heads/main.tar.gz$" - - ".*/archive/refs/heads/master.tar.gz$" + mutable_patterns: + - ".*/archive/refs/heads/.*.tar.gz$" + immutable_patterns: - ".*/archive/refs/tags/.*.tar.gz$" - "ahmetb/kubectx/.*/kubectx_.*_linux_x86_64.tar.gz$" - "ahmetb/kubectx/.*/kubens_.*_linux_x86_64.tar.gz$" @@ -56,40 +55,40 @@ remotes: - "VictoriaMetrics/VictoriaMetrics/.*/vmutils-linux-amd64-.*.tar.gz$" - "xorpaul/g10k/.*/g10k-.*-linux-amd64.zip$" cache: - file_ttl: 0 - index_ttl: 0 + immutable_ttl: 0 + mutable_ttl: 7200 github_user: base_url: "https://raw.githubusercontent.com" type: "remote" package: "generic" description: "GitHub User Content" - include_patterns: + immutable_patterns: - "argoproj/argo-cd/.*.yaml$" - "yannh/kubernetes-json-schema/master/.*.json$" - "datreeio/CRDs-catalog/main/.*.json$" cache: - file_ttl: 0 - index_ttl: 0 + immutable_ttl: 0 + mutable_ttl: 7200 gitea-dl: base_url: "https://dl.gitea.com" type: "remote" package: "generic" description: "Gitea download site" - include_patterns: + immutable_patterns: - "act_runner/.*/act_runner-.*-linux-amd64$" - "tea/.*/tea-.*-linux-amd64$" cache: - file_ttl: 0 - index_ttl: 0 + immutable_ttl: 0 + mutable_ttl: 7200 hashicorp-releases: base_url: "https://releases.hashicorp.com" type: "remote" package: "generic" description: "HashiCorp product releases" - include_patterns: + immutable_patterns: - "terraform/.*terraform_.*_linux_amd64\\.zip$" - "terraform/.*terraform_.*_windows_amd64\\.zip$" - "terraform/.*terraform_.*_darwin_amd64\\.zip$" @@ -102,37 +101,37 @@ remotes: - "nomad/.*/nomad_.*_linux_amd64\\.zip$" - "packer/.*/packer_.*_linux_amd64\\.zip$" cache: - file_ttl: 0 - index_ttl: 0 + immutable_ttl: 0 + mutable_ttl: 7200 rarlab: base_url: "https://www.rarlab.com" type: "remote" package: "generic" description: "RARLab" - include_patterns: + immutable_patterns: - "rar/rarlinux-x64-.*.tar.gz" cache: - file_ttl: 0 - index_ttl: 0 + immutable_ttl: 0 + mutable_ttl: 7200 alpine: base_url: "https://dl-cdn.alpinelinux.org" type: "remote" package: "alpine" description: "Alpine Linux APK package repository" - include_patterns: + immutable_patterns: - ".*/x86_64/.*\\.apk$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 almalinux: base_url: "https://gsl-syd.mm.fcix.net/almalinux" type: "remote" package: "rpm" description: "AlmaLinux RPM package repository" - include_patterns: + immutable_patterns: - ".*/x86_64/.*\\.rpm$" - ".*/noarch/.*\\.rpm$" - ".*/repodata/.*\\.sqlite.*$" @@ -143,54 +142,54 @@ remotes: - ".*/updates.img" - ".*/RPM-GPG-KEY-.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 ceph-reef: base_url: "https://download.ceph.com/rpm-reef/" type: "remote" package: "rpm" description: "Ceph Reef 18" - include_patterns: + immutable_patterns: - ".*/x86_64/.*\\.rpm$" - ".*/noarch/.*\\.rpm$" - ".*/repodata/.*\\.xml.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 ceph-squid: base_url: "https://download.ceph.com/rpm-squid/" type: "remote" package: "rpm" description: "Ceph Squid 19" - include_patterns: + immutable_patterns: - ".*/x86_64/.*\\.rpm$" - ".*/noarch/.*\\.rpm$" - ".*/repodata/.*\\.xml.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 ceph-tentacle: base_url: "https://download.ceph.com/rpm-tentacle/" type: "remote" package: "rpm" description: "Ceph Tentacle 20" - include_patterns: + immutable_patterns: - ".*/x86_64/.*\\.rpm$" - ".*/noarch/.*\\.rpm$" - ".*/repodata/.*\\.xml.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 epel: base_url: "https://gsl-syd.mm.fcix.net/epel" type: "remote" package: "rpm" description: "EPEL (Extra Packages for Enterprise Linux)" - include_patterns: + immutable_patterns: - ".*/Everything/x86_64/.*\\.rpm$" - ".*/noarch/.*\\.rpm$" - ".*/repodata/.*\\.sqlite.*$" @@ -198,145 +197,145 @@ remotes: - ".*/repodata/.*\\.yaml.*$" - "RPM-GPG-KEY-.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 fedora: base_url: "https://gsl-syd.mm.fcix.net/fedora/linux" type: "remote" package: "rpm" description: "Fedora Linux RPM package repository" - include_patterns: + immutable_patterns: - "releases/.*/Everything/x86_64/.*\\.rpm$" - "updates/.*/Everything/x86_64/.*\\.rpm$" - "development/.*/Everything/x86_64/.*\\.rpm$" - ".*/noarch/.*\\.rpm$" - ".*/repodata/.*\\.xml.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 frr: base_url: "https://rpm.frrouting.org/repo" type: "remote" package: "rpm" description: "FRR RPM package repository" - include_patterns: + immutable_patterns: - ".*\\.rpm$" - ".*/repodata/.*\\.xml.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 mariadb: base_url: "http://mariadb.mirror.digitalpacific.com.au/yum" type: "remote" package: "rpm" description: "MariaDB RPM package repository" - include_patterns: + immutable_patterns: - ".*\\.rpm$" - ".*/repodata/.*\\.xml.*$" - ".*/RPM-GPG-KEY-.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 openvox: base_url: "https://yum.voxpupuli.org" type: "remote" package: "rpm" description: "OpenVox RPM package repository" - include_patterns: + immutable_patterns: - ".*\\.rpm$" - ".*/repodata/.*\\.xml.*$" - "GPG-KEY-.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 postgresql: base_url: "https://download.postgresql.org/pub/repos/yum" type: "remote" package: "rpm" description: "PostgreSQL RPM package repository" - include_patterns: + immutable_patterns: - ".*\\.rpm$" - ".*/repodata/.*\\.xml.*$" - ".*/RPM-GPG-KEY-.*$" - ".*/PGDG-RPM-GPG-KEY-.*$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 rke2: base_url: "https://rpm.rancher.io" type: "remote" package: "rpm" description: "RKE2 RPM package repository" - include_patterns: + immutable_patterns: - ".*\\.rpm$" - ".*/repodata/.*\\.xml.*$" - "public.key$" cache: - file_ttl: 0 - index_ttl: 7200 + immutable_ttl: 0 + mutable_ttl: 7200 zfs: base_url: "http://download.zfsonlinux.org" type: "remote" package: "rpm" description: "ZFS RPM package repository" - include_patterns: + immutable_patterns: - ".*\\.rpm$" - ".*/repodata/.*\\.xml.*$" cache: - file_ttl: 0 - index_ttl: 7200 - + immutable_ttl: 0 + mutable_ttl: 7200 claude-ai: base_url: "https://downloads.claude.ai" type: "remote" package: "generic" description: "Anthropic Claude Code binary releases" - include_patterns: + mutable_patterns: + - "claude-code-releases/.*/manifest.json$" + immutable_patterns: - "claude-code-releases/.*/linux-x64/claude$" - "claude-code-releases/.*/linux-arm64/claude$" - "claude-code-releases/.*/linux-x64-musl/claude$" - "claude-code-releases/.*/linux-arm64-musl/claude$" - - "claude-code-releases/.*/manifest.json$" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 7200 local-generic: type: "local" package: "generic" description: "Local generic file repository" cache: - file_ttl: 0 - index_ttl: 0 + immutable_ttl: 0 + mutable_ttl: 0 ghcr: base_url: "https://ghcr.io" type: "remote" package: "docker" description: "GitHub Container Registry" - include_patterns: + immutable_patterns: - "^cloudnative-pg/cloudnative-pg" - "^openvoxproject/" - "^stakater/reloader" - "^voxpupuli/puppetboard" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300 dockerhub: base_url: "https://registry-1.docker.io" type: "remote" package: "docker" description: "Docker Hub registry" - include_patterns: + immutable_patterns: - "^library/busybox" - "^library/nginx" - "^library/postgres" @@ -352,63 +351,63 @@ remotes: - "^victoriametrics/" - "^woodpeckerci/" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300 quay: base_url: "https://quay.io" type: "remote" package: "docker" description: "Quay.io container registry" - include_patterns: + immutable_patterns: - "^brancz/kube-rbac-proxy" - "^cephcsi/cephcsi" - "^jetstack/cert-manager-" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300 k8s-registry: base_url: "https://registry.k8s.io" type: "remote" package: "docker" description: "Kubernetes container registry" - include_patterns: + immutable_patterns: - "^external-dns/external-dns" - "^sig-storage/" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300 gitlab: base_url: "https://registry.gitlab.com" type: "remote" package: "docker" description: "GitLab container registry" - include_patterns: + immutable_patterns: - "^purelb/purelb" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300 elastic: base_url: "https://docker.elastic.co" type: "remote" package: "docker" description: "Elastic container registry" - include_patterns: + immutable_patterns: - "^eck/eck-operator" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300 gcr: base_url: "https://gcr.io" type: "remote" package: "docker" description: "Google Container Registry" - include_patterns: + immutable_patterns: - "^k8s-staging-nfd/node-feature-discovery" cache: - file_ttl: 0 - index_ttl: 300 + immutable_ttl: 0 + mutable_ttl: 300