Merge branch 'master' into dev

argoproj · Oct 13, 2024 · 8f65a35 · 8f65a35
2 parents 09ec136 + 9b11b21
commit 8f65a35
Show file tree

Hide file tree

Showing 45 changed files with 989 additions and 133 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -69,20 +69,16 @@ jobs:
  - name: Fetch all tags
  run: git fetch --force --tags
 
- - name: Set GORELEASER_PREVIOUS_TAG # Workaround, GoReleaser uses 'git-describe' to determine a previous tag. Our tags are created in realease branches.
- run: |
- set -xue
- if echo ${{ github.ref_name }} | grep -E -- '-rc1+$';then
- echo "GORELEASER_PREVIOUS_TAG=$(git -c 'versionsort.suffix=-rc' tag --list --sort=version:refname | tail -n 2 | head -n 1)" >> $GITHUB_ENV
- else
- echo "This is not the first release on the branch, Using GoReleaser defaults"
- fi
-
  - name: Setup Golang
  uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
  with:
  go-version: ${{ env.GOLANG_VERSION }}
 
+ - name: Set GORELEASER_PREVIOUS_TAG # Workaround, GoReleaser uses 'git-describe' to determine a previous tag. Our tags are created in release branches.
+ run: |
+ set -xue
+ echo "GORELEASER_PREVIOUS_TAG=$(go run hack/get-previous-release/get-previous-version-for-release-notes.go ${{ github.ref_name }})" >> $GITHUB_ENV
+
  - name: Set environment variables for ldflags
  id: set_ldflag
  run: |
@@ -105,7 +101,7 @@ jobs:
  args: release --clean --timeout 55m
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- KUBECTL_VERSION: ${{ env.KUBECTL_VERSION }} 
+ KUBECTL_VERSION: ${{ env.KUBECTL_VERSION }}
  GIT_TREE_STATE: ${{ env.GIT_TREE_STATE }}
 
  - name: Generate subject for provenance
@@ -188,7 +184,7 @@ jobs:
  fi
 
  cd /tmp && tar -zcf sbom.tar.gz *.spdx
- 
+
  - name: Generate SBOM hash
  shell: bash
  id: sbom-hash
@@ -197,29 +193,29 @@ jobs:
  # base64 -w0 encodes to base64 and outputs on a single line.
  # sha256sum /tmp/sbom.tar.gz ... | base64 -w0
  echo "hashes=$(sha256sum /tmp/sbom.tar.gz | base64 -w0)" >> "$GITHUB_OUTPUT"
- 
+
  - name: Upload SBOM
  uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  files: |
  /tmp/sbom.tar.gz
- 
+
  sbom-provenance:
  needs: [generate-sbom]
  permissions:
  actions: read # for detecting the Github Actions environment
  id-token: write # Needed for provenance signing and ID
  contents: write # Needed for release uploads
  if: github.repository == 'argoproj/argo-cd'
- # Must be refernced by a tag. https://github.com/slsa-framework/slsa-github-generator/blob/main/internal/builders/container/README.md#referencing-the-slsa-generator
+ # Must be referenced by a tag. https://github.com/slsa-framework/slsa-github-generator/blob/main/internal/builders/container/README.md#referencing-the-slsa-generator
  uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
  with:
  base64-subjects: "${{ needs.generate-sbom.outputs.hashes }}"
  provenance-name: "argocd-sbom.intoto.jsonl"
  upload-assets: true
- 
+
  post-release:
  needs:
  - argocd-image

diff --git a/USERS.md b/USERS.md
@@ -273,6 +273,7 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [PT Boer Technology (Btech)](https://btech.id/)
 1. [PUBG](https://www.pubg.com)
 1. [Puzzle ITC](https://www.puzzle.ch/)
+1. [Pvotal Technologies](https://pvotal.tech/)
 1. [Qonto](https://qonto.com)
 1. [QuintoAndar](https://quintoandar.com.br)
 1. [Quipper](https://www.quipper.com/)

diff --git a/applicationset/generators/cluster.go b/applicationset/generators/cluster.go
@@ -107,6 +107,7 @@ func (g *ClusterGenerator) GenerateParams(appSetGenerator *argoappsetv1alpha1.Ap
  params["name"] = cluster.Name
  params["nameNormalized"] = cluster.Name
  params["server"] = cluster.Server
+ params["project"] = ""
 
  err = appendTemplatedValues(appSetGenerator.Clusters.Values, params, appSet.Spec.GoTemplate, appSet.Spec.GoTemplateOptions)
  if err != nil {
@@ -131,6 +132,13 @@ func (g *ClusterGenerator) GenerateParams(appSetGenerator *argoappsetv1alpha1.Ap
  params["nameNormalized"] = utils.SanitizeName(string(cluster.Data["name"]))
  params["server"] = string(cluster.Data["server"])
 
+ project, ok := cluster.Data["project"]
+ if ok {
+ params["project"] = string(project)
+ } else {
+ params["project"] = ""
+ }
+
  if appSet.Spec.GoTemplate {
  meta := map[string]interface{}{}
 

diff --git a/applicationset/generators/cluster_test.go b/applicationset/generators/cluster_test.go
@@ -76,9 +76,10 @@ func TestGenerateParams(t *testing.T) {
  },
  },
  Data: map[string][]byte{
- "config": []byte("{}"),
- "name": []byte("production_01/west"),
- "server": []byte("https://production-01.example.com"),
+ "config": []byte("{}"),
+ "name": []byte("production_01/west"),
+ "server": []byte("https://production-01.example.com"),
+ "project": []byte("prod-project"),
  },
  Type: corev1.SecretType("Opaque"),
  },
@@ -106,15 +107,15 @@ func TestGenerateParams(t *testing.T) {
  "aaa": "{{ server }}",
  "no-op": "{{ this-does-not-exist }}",
  }, expected: []map[string]interface{}{
- {"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "{{ metadata.annotations.foo.argoproj.io }}", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "{{ metadata.labels.environment }}", "values.aaa": "https://kubernetes.default.svc", "nameNormalized": "in-cluster", "name": "in-cluster", "server": "https://kubernetes.default.svc"},
+ {"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "{{ metadata.annotations.foo.argoproj.io }}", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "{{ metadata.labels.environment }}", "values.aaa": "https://kubernetes.default.svc", "nameNormalized": "in-cluster", "name": "in-cluster", "server": "https://kubernetes.default.svc", "project": ""},
  {
  "values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "production", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "production", "values.aaa": "https://production-01.example.com", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
  },
 
  {
  "values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "staging", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "staging", "values.aaa": "https://staging-01.example.com", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
  },
  },
  clientError: false,
@@ -131,12 +132,12 @@ func TestGenerateParams(t *testing.T) {
  expected: []map[string]interface{}{
  {
  "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
  },
 
  {
  "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
  },
  },
  clientError: false,
@@ -155,7 +156,7 @@ func TestGenerateParams(t *testing.T) {
  expected: []map[string]interface{}{
  {
  "values.foo": "bar", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
  },
  },
  clientError: false,
@@ -181,11 +182,11 @@ func TestGenerateParams(t *testing.T) {
  expected: []map[string]interface{}{
  {
  "values.foo": "bar", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
  },
  {
  "values.foo": "bar", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
  },
  },
  clientError: false,
@@ -214,7 +215,7 @@ func TestGenerateParams(t *testing.T) {
  expected: []map[string]interface{}{
  {
  "values.name": "baz", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
  },
  },
  clientError: false,
@@ -244,15 +245,15 @@ func TestGenerateParams(t *testing.T) {
  expected: []map[string]interface{}{
  {
  "clusters": []map[string]interface{}{
- {"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "{{ metadata.annotations.foo.argoproj.io }}", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "{{ metadata.labels.environment }}", "values.aaa": "https://kubernetes.default.svc", "nameNormalized": "in-cluster", "name": "in-cluster", "server": "https://kubernetes.default.svc"},
+ {"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "{{ metadata.annotations.foo.argoproj.io }}", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "{{ metadata.labels.environment }}", "values.aaa": "https://kubernetes.default.svc", "nameNormalized": "in-cluster", "name": "in-cluster", "server": "https://kubernetes.default.svc", "project": ""},
  {
  "values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "production", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "production", "values.aaa": "https://production-01.example.com", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
  },
 
  {
  "values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "staging", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "staging", "values.aaa": "https://staging-01.example.com", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
  },
  },
  },
@@ -284,11 +285,11 @@ func TestGenerateParams(t *testing.T) {
  "clusters": []map[string]interface{}{
  {
  "values.foo": "bar", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
  },
  {
  "values.foo": "bar", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
- "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging",
+ "metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
  },
  },
  },
@@ -419,6 +420,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "production_01/west",
  "nameNormalized": "production-01-west",
  "server": "https://production-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -444,6 +446,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "staging-01",
  "nameNormalized": "staging-01",
  "server": "https://staging-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -469,6 +472,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "nameNormalized": "in-cluster",
  "name": "in-cluster",
  "server": "https://kubernetes.default.svc",
+ "project": "",
  "values": map[string]string{
  "lol1": "lol",
  "lol2": "<no value><no value>",
@@ -497,6 +501,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "production_01/west",
  "nameNormalized": "production-01-west",
  "server": "https://production-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -512,6 +517,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "staging-01",
  "nameNormalized": "staging-01",
  "server": "https://staging-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -542,6 +548,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "production_01/west",
  "nameNormalized": "production-01-west",
  "server": "https://production-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -582,6 +589,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "production_01/west",
  "nameNormalized": "production-01-west",
  "server": "https://production-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -600,6 +608,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "staging-01",
  "nameNormalized": "staging-01",
  "server": "https://staging-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -643,6 +652,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "staging-01",
  "nameNormalized": "staging-01",
  "server": "https://staging-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -690,6 +700,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "nameNormalized": "in-cluster",
  "name": "in-cluster",
  "server": "https://kubernetes.default.svc",
+ "project": "",
  "values": map[string]string{
  "lol1": "lol",
  "lol2": "<no value><no value>",
@@ -705,6 +716,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "production_01/west",
  "nameNormalized": "production-01-west",
  "server": "https://production-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -730,6 +742,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "staging-01",
  "nameNormalized": "staging-01",
  "server": "https://staging-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -782,6 +795,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "production_01/west",
  "nameNormalized": "production-01-west",
  "server": "https://production-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",
@@ -800,6 +814,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
  "name": "staging-01",
  "nameNormalized": "staging-01",
  "server": "https://staging-01.example.com",
+ "project": "",
  "metadata": map[string]interface{}{
  "labels": map[string]string{
  "argocd.argoproj.io/secret-type": "cluster",