feat: [CDS-37768]: v2.3.4 (argoproj#20)

* Documentation for argo-cd upgrades

* Merge pull request argoproj#12 from wings-software/conn-type

[CDS-33491]: Add ConectionType enum to clusters and repos

* Connection Type for repos and clusters

* feat: [CDS-37954]: Returning the entire RepoCreds object instead of only the URL (argoproj#14)

* remove repo.appDetails breaking line

* Merge pull request argoproj#2 from wings-software/GIT-265

Mask repository secrets instead of exposing them in order to tell the…

* Merge pull request argoproj#3 from wings-software/GIT-260

deprecate updateFields and use google.protobuf.FieldMask updateMask i…

* Merge pull request argoproj#8 from wings-software/GIT-436

Git 436

* Merge pull request argoproj#10 from wings-software/GIT-436

[GIT-436]: Fixed mask not being able to overwrite with zero-value

* clean up

* harness-gen

* update generate file

* fix imports

* lint fix

* update doc

* update versions

* include versions in maifest

* update manifests

* adjust proto num

.github/workflows/image.yaml

@@ -54,7 +54,7 @@ jobs:
           echo "Building image for platforms: $IMAGE_PLATFORMS"
           docker buildx build --platform $IMAGE_PLATFORMS --push="${{ github.event_name == 'push' }}" \
             -t ghcr.io/argoproj/argocd:${{ steps.image.outputs.tag }} \
-            -t quay.io/argoproj/argocd:latest .
+            -t quay.io/argoproj/argocd:v2.3.4 .
         working-directory: ./src/github.com/argoproj/argo-cd
 
 

HARNESS.md

@@ -0,0 +1,12 @@
+# Harness Argo CD #
+
+## Upgrade Documentation
+
+0. Connect upstream
+1. Pull upstream tags
+- `git fetch --all --tags`   
+2. Create a branch from a version tag
+- `git checkout tags/vM.M.P -b harness/vM.M.P`
+3. Cherry-pick : [Harness Modifications](https://harness.atlassian.net/wiki/spaces/GIT/pages/21086830726/Maintain+ArgoCD+fork+for+GitOps+Agent)
+4. make harness-gen 
+5. Upgrade Service & Agent

Makefile

@@ -212,6 +212,10 @@ clidocsgen: ensure-gopath
 codegen-local: ensure-gopath mod-vendor-local notification-docs notification-catalog gogen protogen clientgen openapigen clidocsgen manifests-local
 	rm -rf vendor/
 
+.PHONY: harness-gen
+harness-gen: ensure-gopath mod-vendor-local gogen protogen openapigen manifests-local
+	rm -rf vendor/
+
 .PHONY: codegen
 codegen: test-tools-image
 	$(call run-in-test-client,make codegen-local)

assets/swagger.json

@@ -1749,6 +1749,16 @@
             "name": "updatedFields",
             "in": "query"
           },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "description": "The set of field mask paths.",
+            "name": "updateMask.paths",
+            "in": "query"
+          },
           {
             "type": "string",
             "description": "type is the type of the specified cluster identifier ( \"server\" - default, \"name\" ).",
@@ -2634,6 +2644,16 @@
             "schema": {
               "$ref": "#/definitions/v1alpha1Repository"
             }
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "description": "The set of field mask paths.",
+            "name": "updateMask.paths",
+            "in": "query"
           }
         ],
         "responses": {
@@ -3921,6 +3941,20 @@
         }
       }
     },
+    "protobufFieldMask": {
+      "description": "paths: \"f.a\"\n    paths: \"f.b.d\"\n\nHere `f` represents a field in some root message, `a` and `b`\nfields in the message found in `f`, and `d` a field found in the\nmessage in `f.b`.\n\nField masks are used to specify a subset of fields that should be\nreturned by a get operation or modified by an update operation.\nField masks also have a custom JSON encoding (see below).\n\n# Field Masks in Projections\n\nWhen used in the context of a projection, a response message or\nsub-message is filtered by the API to only contain those fields as\nspecified in the mask. For example, if the mask in the previous\nexample is applied to a response message as follows:\n\n    f {\n      a : 22\n      b {\n        d : 1\n        x : 2\n      }\n      y : 13\n    }\n    z: 8\n\nThe result will not contain specific values for fields x,y and z\n(their value will be set to the default, and omitted in proto text\noutput):\n\n\n    f {\n      a : 22\n      b {\n        d : 1\n      }\n    }\n\nA repeated field is not allowed except at the last position of a\npaths string.\n\nIf a FieldMask object is not present in a get operation, the\noperation applies to all fields (as if a FieldMask of all fields\nhad been specified).\n\nNote that a field mask does not necessarily apply to the\ntop-level response message. In case of a REST get operation, the\nfield mask applies directly to the response, but in case of a REST\nlist operation, the mask instead applies to each individual message\nin the returned resource list. In case of a REST custom method,\nother definitions may be used. Where the mask applies will be\nclearly documented together with its declaration in the API.  In\nany case, the effect on the returned resource/resources is required\nbehavior for APIs.\n\n# Field Masks in Update Operations\n\nA field mask in update operations specifies which fields of the\ntargeted resource are going to be updated. The API is required\nto only change the values of the fields as specified in the mask\nand leave the others untouched. If a resource is passed in to\ndescribe the updated values, the API ignores the values of all\nfields not covered by the mask.\n\nIf a repeated field is specified for an update operation, new values will\nbe appended to the existing repeated field in the target resource. Note that\na repeated field is only allowed in the last position of a `paths` string.\n\nIf a sub-message is specified in the last position of the field mask for an\nupdate operation, then new value will be merged into the existing sub-message\nin the target resource.\n\nFor example, given the target message:\n\n    f {\n      b {\n        d: 1\n        x: 2\n      }\n      c: [1]\n    }\n\nAnd an update message:\n\n    f {\n      b {\n        d: 10\n      }\n      c: [2]\n    }\n\nthen if the field mask is:\n\n paths: [\"f.b\", \"f.c\"]\n\nthen the result will be:\n\n    f {\n      b {\n        d: 10\n        x: 2\n      }\n      c: [1, 2]\n    }\n\nAn implementation may provide options to override this default behavior for\nrepeated and message fields.\n\nIn order to reset a field's value to the default, the field must\nbe in the mask and set to the default value in the provided resource.\nHence, in order to reset all fields of a resource, provide a default\ninstance of the resource and set all fields in the mask, or do\nnot provide a mask as described below.\n\nIf a field mask is not present on update, the operation applies to\nall fields (as if a field mask of all fields has been specified).\nNote that in the presence of schema evolution, this may mean that\nfields the client does not know and has therefore not filled into\nthe request will be reset to their default. If this is unwanted\nbehavior, a specific service may require a client to always specify\na field mask, producing an error if not.\n\nAs with get operations, the location of the resource which\ndescribes the updated values in the request message depends on the\noperation kind. In any case, the effect of the field mask is\nrequired to be honored by the API.\n\n## Considerations for HTTP REST\n\nThe HTTP kind of an update operation which uses a field mask must\nbe set to PATCH instead of PUT in order to satisfy HTTP semantics\n(PUT must only be used for full updates).\n\n# JSON Encoding of Field Masks\n\nIn JSON, a field mask is encoded as a single string where paths are\nseparated by a comma. Fields name in each path are converted\nto/from lower-camel naming conventions.\n\nAs an example, consider the following message declarations:\n\n    message Profile {\n      User user = 1;\n      Photo photo = 2;\n    }\n    message User {\n      string display_name = 1;\n      string address = 2;\n    }\n\nIn proto a field mask for `Profile` may look as such:\n\n    mask {\n      paths: \"user.display_name\"\n      paths: \"photo\"\n    }\n\nIn JSON, the same mask is represented as below:\n\n    {\n      mask: \"user.displayName,photo\"\n    }\n\n# Field Masks and Oneof Fields\n\nField masks treat fields in oneofs just as regular fields. Consider the\nfollowing message:\n\n    message SampleMessage {\n      oneof test_oneof {\n        string name = 4;\n        SubMessage sub_message = 9;\n      }\n    }\n\nThe field mask can be:\n\n    mask {\n      paths: \"name\"\n    }\n\nOr:\n\n    mask {\n      paths: \"sub_message\"\n    }\n\nNote that oneof type names (\"test_oneof\" in this case) cannot be used in\npaths.\n\n## Field Mask Verification\n\nThe implementation of any API method which has a FieldMask type field in the\nrequest should verify the included field paths, and return an\n`INVALID_ARGUMENT` error if any path is unmappable.",
+      "type": "object",
+      "title": "`FieldMask` represents a set of symbolic field paths, for example:",
+      "properties": {
+        "paths": {
+          "description": "The set of field mask paths.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "repocredsRepoCredsResponse": {
       "type": "object",
       "title": "RepoCredsResponse is a response to most repository credentials requests"
@@ -5373,6 +5407,10 @@
           "description": "Server requires Bearer authentication. This client will not attempt to use\nrefresh tokens for an OAuth2 flow.\nTODO: demonstrate an OAuth2 compatible client.",
           "type": "string"
         },
+        "clusterConnectionType": {
+          "type": "string",
+          "title": "Identifies the authentication method used to connect to the cluster"
+        },
         "execProviderConfig": {
           "$ref": "#/definitions/v1alpha1ExecProviderConfig"
         },
@@ -6007,6 +6045,10 @@
         "connectionState": {
           "$ref": "#/definitions/v1alpha1ConnectionState"
         },
+        "connectionType": {
+          "type": "string",
+          "title": "Identifies the authentication method used to connect to the repository"
+        },
         "enableLfs": {
           "description": "EnableLFS specifies whether git-lfs support should be enabled for this repo. Only valid for Git repositories.",
           "type": "boolean"

docs/operator-manual/custom_tools.md

@@ -51,7 +51,7 @@ following example builds an entirely customized repo-server from a Dockerfile, i
 dependencies that may be needed for generating manifests.
 
 ```Dockerfile
-FROM argoproj/argocd:latest
+FROM argoproj/argocd:v2.3.4
 
 # Switch to root for the ability to perform install
 USER root

docs/operator-manual/upgrading/2.0-2.1.md

@@ -30,7 +30,7 @@ The `argocd-util` CLI commands are available under `argocd admin` and the `argoc
 Runtime system user should to be changed from `argocd` to `999`, as shown below.
 
 ```dockerfile
-FROM argoproj/argocd:latest
+FROM argoproj/argocd:v2.3.4
 
 # Switch to root for the ability to perform install
 USER root

docs/proposals/config-management-plugin-v2.md

@@ -124,7 +124,7 @@ initContainers:
   - -n
   - /usr/local/bin/argocd
   - /var/run/argocd/argocd-cmp-server
-  image: quay.io/argoproj/argocd:latest
+  image: quay.io/argoproj/argocd:v2.3.4
   name: copyutil
   volumeMounts:
   - mountPath: /var/run/argocd
@@ -247,7 +247,7 @@ initContainers:
   - -n
   - /usr/local/bin/argocd
   - /var/run/argocd/argocd-cmp-server
-  image: quay.io/argoproj/argocd:latest
+  image: quay.io/argoproj/argocd:v2.3.4
   name: copyutil
   volumeMounts:
   - mountPath: /var/run/argocd

docs/user-guide/commands/argocd.md

@@ -19,7 +19,7 @@ argocd [flags]
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
   -h, --help                            help for argocd
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account.md

@@ -41,7 +41,7 @@ argocd account [flags]
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_can-i.md

@@ -42,7 +42,7 @@ Resources: [clusters projects applications repositories certificates]
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_delete-token.md

@@ -35,7 +35,7 @@ argocd account delete-token --account <account-name> ID
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_generate-token.md

@@ -37,7 +37,7 @@ argocd account generate-token --account <account-name>
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_get-user-info.md

@@ -25,7 +25,7 @@ argocd account get-user-info [flags]
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_get.md

@@ -36,7 +36,7 @@ argocd account get --account <account-name>
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_list.md

@@ -31,7 +31,7 @@ argocd account list
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_account_update-password.md

@@ -47,7 +47,7 @@ argocd account update-password [flags]
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS

docs/user-guide/commands/argocd_admin.md

@@ -24,7 +24,7 @@ argocd admin [flags]
       --grpc-web-root-path string       Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. Set web root.
   -H, --header strings                  Sets additional header to all requests made by Argo CD CLI. (Can be repeated multiple times to add multiple headers, also supports comma separated headers)
       --http-retry-max int              Maximum number of retries to establish http connection to Argo CD server
-      --insecure                        Skip server certificate and domain verification
+      --insecure                        Skip server certificate and domain verification (default true)
       --logformat string                Set the logging format. One of: text|json (default "text")
       --loglevel string                 Set the logging level. One of: debug|info|warn|error (default "info")
       --plaintext                       Disable TLS