From aa8b74e35029c42170ef7592d34799abe35eaddf Mon Sep 17 00:00:00 2001 From: Takumi Takahashi Date: Sat, 26 Apr 2025 16:56:20 +0900 Subject: [PATCH 1/5] feat(kubernetes/kube-aggregator): scaffold kubernetes/kube-aggregator --- pkgs/kubernetes/kube-aggregator/pkg.yaml | 1 + pkgs/kubernetes/kube-aggregator/registry.yaml | 7 +++++++ pkgs/kubernetes/kube-aggregator/scaffold.yaml | 9 +++++++++ registry.yaml | 5 +++++ 4 files changed, 22 insertions(+) create mode 100644 pkgs/kubernetes/kube-aggregator/pkg.yaml create mode 100644 pkgs/kubernetes/kube-aggregator/registry.yaml create mode 100644 pkgs/kubernetes/kube-aggregator/scaffold.yaml diff --git a/pkgs/kubernetes/kube-aggregator/pkg.yaml b/pkgs/kubernetes/kube-aggregator/pkg.yaml new file mode 100644 index 00000000000..3334c0e4395 --- /dev/null +++ b/pkgs/kubernetes/kube-aggregator/pkg.yaml @@ -0,0 +1 @@ +packages: [] diff --git a/pkgs/kubernetes/kube-aggregator/registry.yaml b/pkgs/kubernetes/kube-aggregator/registry.yaml new file mode 100644 index 00000000000..0b08e526c6f --- /dev/null +++ b/pkgs/kubernetes/kube-aggregator/registry.yaml @@ -0,0 +1,7 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json +packages: + - type: github_release + repo_owner: kubernetes + repo_name: kube-aggregator + description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" + version_filter: not (Version matches "-(alpha|beta|rc)") diff --git a/pkgs/kubernetes/kube-aggregator/scaffold.yaml b/pkgs/kubernetes/kube-aggregator/scaffold.yaml new file mode 100644 index 00000000000..28266e539eb --- /dev/null +++ b/pkgs/kubernetes/kube-aggregator/scaffold.yaml @@ -0,0 +1,9 @@ +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-generate-registry.json +# aqua - Declarative CLI Version Manager +# https://aquaproj.github.io/ +# Other than name is optional. All initial values are just examples. +name: kubernetes/kube-aggregator +version_filter: not (Version matches "-(alpha|beta|rc)") +# version_prefix: cli- +# all_assets_filter: not (Asset matches "-cli") diff --git a/registry.yaml b/registry.yaml index e2cbe6df53b..07dd0c24e58 100644 --- a/registry.yaml +++ b/registry.yaml @@ -43063,6 +43063,11 @@ packages: type: github_release asset: "{{.Asset}}.sha256" algorithm: sha256 + - type: github_release + repo_owner: kubernetes + repo_name: kube-aggregator + description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" + version_filter: not (Version matches "-(alpha|beta|rc)") - name: kubernetes/kubeadm type: http repo_owner: kubernetes From afd409017f01daea966a41f5743d8da748d9746c Mon Sep 17 00:00:00 2001 From: Takumi Takahashi Date: Sat, 26 Apr 2025 17:11:52 +0900 Subject: [PATCH 2/5] fix(kubernetes/kube-aggregator): pass cmdx t --- pkgs/kubernetes/kube-aggregator/pkg.yaml | 5 ++- pkgs/kubernetes/kube-aggregator/registry.yaml | 35 +++++++++++++++++-- registry.yaml | 35 +++++++++++++++++-- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/pkgs/kubernetes/kube-aggregator/pkg.yaml b/pkgs/kubernetes/kube-aggregator/pkg.yaml index 3334c0e4395..129d35453ae 100644 --- a/pkgs/kubernetes/kube-aggregator/pkg.yaml +++ b/pkgs/kubernetes/kube-aggregator/pkg.yaml @@ -1 +1,4 @@ -packages: [] +packages: + - name: kubernetes/kube-aggregator@v1.33.0 + - name: kubernetes/kube-aggregator + version: v1.25.4 diff --git a/pkgs/kubernetes/kube-aggregator/registry.yaml b/pkgs/kubernetes/kube-aggregator/registry.yaml index 0b08e526c6f..6b229867311 100644 --- a/pkgs/kubernetes/kube-aggregator/registry.yaml +++ b/pkgs/kubernetes/kube-aggregator/registry.yaml @@ -1,7 +1,38 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json packages: - - type: github_release + - name: kubernetes/kube-aggregator + type: http repo_owner: kubernetes - repo_name: kube-aggregator + repo_name: kubernetes description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux version_filter: not (Version matches "-(alpha|beta|rc)") + version_constraint: "false" + version_overrides: + - version_constraint: semver("<= 1.18.20") + no_asset: true + - version_constraint: semver("<= 1.25.4") + checksum: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 + algorithm: sha256 + - version_constraint: "true" + checksum: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 + algorithm: sha256 + cosign: + signature: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig + certificate: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert + opts: + - --certificate-identity + - "krel-staging@k8s-releng-prod.iam.gserviceaccount.com" + - --certificate-oidc-issuer + - "https://accounts.google.com" diff --git a/registry.yaml b/registry.yaml index 07dd0c24e58..bd9ea3a305b 100644 --- a/registry.yaml +++ b/registry.yaml @@ -43063,11 +43063,42 @@ packages: type: github_release asset: "{{.Asset}}.sha256" algorithm: sha256 - - type: github_release + - name: kubernetes/kube-aggregator + type: http repo_owner: kubernetes - repo_name: kube-aggregator + repo_name: kubernetes description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux version_filter: not (Version matches "-(alpha|beta|rc)") + version_constraint: "false" + version_overrides: + - version_constraint: semver("<= 1.18.20") + no_asset: true + - version_constraint: semver("<= 1.25.4") + checksum: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 + algorithm: sha256 + - version_constraint: "true" + checksum: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 + algorithm: sha256 + cosign: + signature: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig + certificate: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert + opts: + - --certificate-identity + - "krel-staging@k8s-releng-prod.iam.gserviceaccount.com" + - --certificate-oidc-issuer + - "https://accounts.google.com" - name: kubernetes/kubeadm type: http repo_owner: kubernetes From 992334f428eb7ac1a6ab34eb6f73a76c73f8e14c Mon Sep 17 00:00:00 2001 From: Takumi Takahashi Date: Mon, 28 Apr 2025 22:56:26 +0900 Subject: [PATCH 3/5] refactor(kubernetes/kube-aggregator): cosign options --- pkgs/kubernetes/kube-aggregator/registry.yaml | 10 ++++------ registry.yaml | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/kubernetes/kube-aggregator/registry.yaml b/pkgs/kubernetes/kube-aggregator/registry.yaml index 6b229867311..9cb36daeff2 100644 --- a/pkgs/kubernetes/kube-aggregator/registry.yaml +++ b/pkgs/kubernetes/kube-aggregator/registry.yaml @@ -25,13 +25,11 @@ packages: url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 algorithm: sha256 cosign: - signature: - type: http - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig - certificate: - type: http - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert opts: + - --signature + - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig + - --certificate + - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert - --certificate-identity - "krel-staging@k8s-releng-prod.iam.gserviceaccount.com" - --certificate-oidc-issuer diff --git a/registry.yaml b/registry.yaml index bd9ea3a305b..339047a0919 100644 --- a/registry.yaml +++ b/registry.yaml @@ -43088,13 +43088,11 @@ packages: url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 algorithm: sha256 cosign: - signature: - type: http - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig - certificate: - type: http - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert opts: + - --signature + - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig + - --certificate + - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert - --certificate-identity - "krel-staging@k8s-releng-prod.iam.gserviceaccount.com" - --certificate-oidc-issuer From 8fc8dc13fb6feef716cc89c8b44ee4ebfb0b483e Mon Sep 17 00:00:00 2001 From: Takumi Takahashi Date: Wed, 30 Apr 2025 23:11:41 +0900 Subject: [PATCH 4/5] fix(kubernetes/kubernetes/kube-aggregator): move package see also: https://github.com/aquaproj/aqua-registry/pull/35712#issuecomment-2841952427 --- pkgs/kubernetes/kube-aggregator/pkg.yaml | 4 -- .../kubernetes/kube-aggregator/pkg.yaml | 4 ++ .../kube-aggregator/registry.yaml | 2 +- .../kube-aggregator/scaffold.yaml | 2 +- registry.yaml | 68 +++++++++---------- 5 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 pkgs/kubernetes/kube-aggregator/pkg.yaml create mode 100644 pkgs/kubernetes/kubernetes/kube-aggregator/pkg.yaml rename pkgs/kubernetes/{ => kubernetes}/kube-aggregator/registry.yaml (96%) rename pkgs/kubernetes/{ => kubernetes}/kube-aggregator/scaffold.yaml (90%) diff --git a/pkgs/kubernetes/kube-aggregator/pkg.yaml b/pkgs/kubernetes/kube-aggregator/pkg.yaml deleted file mode 100644 index 129d35453ae..00000000000 --- a/pkgs/kubernetes/kube-aggregator/pkg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -packages: - - name: kubernetes/kube-aggregator@v1.33.0 - - name: kubernetes/kube-aggregator - version: v1.25.4 diff --git a/pkgs/kubernetes/kubernetes/kube-aggregator/pkg.yaml b/pkgs/kubernetes/kubernetes/kube-aggregator/pkg.yaml new file mode 100644 index 00000000000..2d2c84c5fa1 --- /dev/null +++ b/pkgs/kubernetes/kubernetes/kube-aggregator/pkg.yaml @@ -0,0 +1,4 @@ +packages: + - name: kubernetes/kubernetes/kube-aggregator@v1.33.0 + - name: kubernetes/kubernetes/kube-aggregator + version: v1.25.4 diff --git a/pkgs/kubernetes/kube-aggregator/registry.yaml b/pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml similarity index 96% rename from pkgs/kubernetes/kube-aggregator/registry.yaml rename to pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml index 9cb36daeff2..f26d822af6d 100644 --- a/pkgs/kubernetes/kube-aggregator/registry.yaml +++ b/pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml @@ -1,6 +1,6 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json packages: - - name: kubernetes/kube-aggregator + - name: kubernetes/kubernetes/kube-aggregator type: http repo_owner: kubernetes repo_name: kubernetes diff --git a/pkgs/kubernetes/kube-aggregator/scaffold.yaml b/pkgs/kubernetes/kubernetes/kube-aggregator/scaffold.yaml similarity index 90% rename from pkgs/kubernetes/kube-aggregator/scaffold.yaml rename to pkgs/kubernetes/kubernetes/kube-aggregator/scaffold.yaml index 28266e539eb..5597855a35a 100644 --- a/pkgs/kubernetes/kube-aggregator/scaffold.yaml +++ b/pkgs/kubernetes/kubernetes/kube-aggregator/scaffold.yaml @@ -3,7 +3,7 @@ # aqua - Declarative CLI Version Manager # https://aquaproj.github.io/ # Other than name is optional. All initial values are just examples. -name: kubernetes/kube-aggregator +name: kubernetes/kubernetes/kube-aggregator version_filter: not (Version matches "-(alpha|beta|rc)") # version_prefix: cli- # all_assets_filter: not (Asset matches "-cli") diff --git a/registry.yaml b/registry.yaml index 339047a0919..132b129a56f 100644 --- a/registry.yaml +++ b/registry.yaml @@ -43063,40 +43063,6 @@ packages: type: github_release asset: "{{.Asset}}.sha256" algorithm: sha256 - - name: kubernetes/kube-aggregator - type: http - repo_owner: kubernetes - repo_name: kubernetes - description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator - format: raw - supported_envs: - - linux - version_filter: not (Version matches "-(alpha|beta|rc)") - version_constraint: "false" - version_overrides: - - version_constraint: semver("<= 1.18.20") - no_asset: true - - version_constraint: semver("<= 1.25.4") - checksum: - type: http - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 - algorithm: sha256 - - version_constraint: "true" - checksum: - type: http - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 - algorithm: sha256 - cosign: - opts: - - --signature - - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig - - --certificate - - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert - - --certificate-identity - - "krel-staging@k8s-releng-prod.iam.gserviceaccount.com" - - --certificate-oidc-issuer - - "https://accounts.google.com" - name: kubernetes/kubeadm type: http repo_owner: kubernetes @@ -43178,6 +43144,40 @@ packages: - darwin - linux - windows/amd64 + - name: kubernetes/kubernetes/kube-aggregator + type: http + repo_owner: kubernetes + repo_name: kubernetes + description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux + version_filter: not (Version matches "-(alpha|beta|rc)") + version_constraint: "false" + version_overrides: + - version_constraint: semver("<= 1.18.20") + no_asset: true + - version_constraint: semver("<= 1.25.4") + checksum: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 + algorithm: sha256 + - version_constraint: "true" + checksum: + type: http + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 + algorithm: sha256 + cosign: + opts: + - --signature + - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sig + - --certificate + - https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.cert + - --certificate-identity + - "krel-staging@k8s-releng-prod.iam.gserviceaccount.com" + - --certificate-oidc-issuer + - "https://accounts.google.com" - type: http repo_owner: kubernetes repo_name: minikube From 4cb45380ec8231e3a686358af2c92ad31a34f768 Mon Sep 17 00:00:00 2001 From: Takumi Takahashi Date: Wed, 30 Apr 2025 23:20:21 +0900 Subject: [PATCH 5/5] refactor(kubernetes/kubernetes/kube-aggregator): version_overrides see also: https://github.com/aquaproj/aqua-registry/pull/35712/commits/a6b89ecc20f9c931b0f08acbf57fafb59adccf09 --- .../kubernetes/kube-aggregator/registry.yaml | 12 ++++++++---- registry.yaml | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml b/pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml index f26d822af6d..751c09e9b28 100644 --- a/pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml +++ b/pkgs/kubernetes/kubernetes/kube-aggregator/registry.yaml @@ -5,21 +5,25 @@ packages: repo_owner: kubernetes repo_name: kubernetes description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator - format: raw - supported_envs: - - linux version_filter: not (Version matches "-(alpha|beta|rc)") version_constraint: "false" version_overrides: - version_constraint: semver("<= 1.18.20") no_asset: true - version_constraint: semver("<= 1.25.4") + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux checksum: type: http url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 algorithm: sha256 - version_constraint: "true" + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux checksum: type: http url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 diff --git a/registry.yaml b/registry.yaml index 132b129a56f..997c7f9d9ac 100644 --- a/registry.yaml +++ b/registry.yaml @@ -43149,21 +43149,25 @@ packages: repo_owner: kubernetes repo_name: kubernetes description: "Aggregator for Kubernetes-style API servers: dynamic registration, discovery summarization, secure proxy" - url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator - format: raw - supported_envs: - - linux version_filter: not (Version matches "-(alpha|beta|rc)") version_constraint: "false" version_overrides: - version_constraint: semver("<= 1.18.20") no_asset: true - version_constraint: semver("<= 1.25.4") + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux checksum: type: http url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256 algorithm: sha256 - version_constraint: "true" + url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator + format: raw + supported_envs: + - linux checksum: type: http url: https://dl.k8s.io/{{.Version}}/bin/{{.OS}}/{{.Arch}}/kube-aggregator.sha256