Compare commits

...

27 Commits

Author SHA1 Message Date
Alexander Matyushentsev
36bade7a2d Update manifests to v1.5.4 2020-05-05 11:58:30 -07:00
May Zhang
5754bd3357 Fix version (#3544) 2020-05-05 11:54:35 -07:00
Alexander Matyushentsev
095c5d616b Update manifests to v1.5.3 2020-05-01 21:10:13 -07:00
Alexander Matyushentsev
c3b3a0fc58 Merge branch 'master' into release-1.5 2020-04-30 20:59:32 -07:00
Alexander Matyushentsev
c2c19f42ad Update manifests to v1.5.2 2020-04-15 09:20:36 -07:00
Alexander Matyushentsev
8a3b36bd28 Update manifests to v1.5.1 2020-04-06 08:53:21 -07:00
Alexander Matyushentsev
35a7350b74 fix: return 401 error code if username does not exist (#3369) 2020-04-06 08:19:49 -07:00
jannfis
241e6d0a6e fix: Do not panic while running hooks with short revision (#3368) 2020-04-06 08:19:45 -07:00
jannfis
dbd6b406ac chore: Keep autogenerated message in upstream.yaml for HA manifests (#3367)
* fix: Keep autogenerated message in upstream.yaml
2020-04-06 08:19:40 -07:00
jannfis
a069639135 fix: Increase HAProxy check interval to prevent intermittent failures (#3356)
* Increase HAProxy check interval to prevent intermittent failures/state flapping

* Restore original namespace
2020-04-06 08:19:33 -07:00
May Zhang
76241f9d3b fix: Helm v3 CRD are not deployed (#3345)
* Fixing could not find plugin issue when app sync and app diff

* Fixing codegen error

* Revert "Fixing codegen error"

This reverts commit b2dcfb81

* Fixing codegen error

* If user is logged in, settings API would return ConfigManagementPlugins

* For helm3, add flag --include-crds when calling helm template to support helm3 crd

* Fixing typo.

* Added further assertion of ResourceSyncStatusIs for CRD resources.
2020-04-06 08:19:22 -07:00
Alexander Matyushentsev
bdda410463 Update manifests to v1.5.0 2020-04-02 09:34:43 -07:00
dthomson25
2faa5c89d1 Add V0.8 changes to Rollouts healthcheck (#3331) 2020-04-02 09:01:19 -07:00
Alexander Matyushentsev
a12b7bdb74 fix: argocd fails to connect clusters with IAM authentication configuration (#3325) 2020-03-31 17:50:09 -07:00
Alexander Matyushentsev
9b21c25783 Update manifests to v1.5.0-rc3 2020-03-30 15:00:06 -07:00
Alexander Matyushentsev
e1deca2a9e fix: avoid nil pointer dereference in badge handler (#3316) 2020-03-30 14:30:38 -07:00
Alexander Matyushentsev
62621428b1 fix: pass APIVersions value to manifest generation request during app validation and during app manifests loading (#3312)
* fix: pass APIVersions value to manifest generation request during app validation and during app manifests loading
2020-03-30 13:38:15 -07:00
Shuwei Hao
ab1f9e4658 fix: update help info about argcd account can-i (#3310)
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2020-03-30 13:23:30 -07:00
jannfis
36d1b42d5c Fix possible panic when generating Dex config from malformed YAML (#3303) 2020-03-30 13:23:26 -07:00
Alexander Matyushentsev
8b9d25f6e3 fix: SSO user unable to change local account password (#3297) (#3298)
* fix: SSO user unable to change local account password (#3297)

* apply code review notes
2020-03-30 13:23:22 -07:00
Alexander Matyushentsev
323af4d562 fix: use pagination while loading initial cluster state to avoid memory spikes (#3299) 2020-03-30 13:23:19 -07:00
Alexander Matyushentsev
a946b70b5e fix: fix Cannot read property 'length' of undefined error (#3296) 2020-03-30 13:23:15 -07:00
Alexander Matyushentsev
f9f1bdaabe Update manifests to v1.5.0-rc2 2020-03-25 22:12:54 -07:00
Alexander Matyushentsev
e66b6109f7 fix: implement workaround for helm/helm#6870 bug (#3290)
* fix: implement workaround for  helm/helm#6870 bug

* Update app_management_test.go
2020-03-25 22:11:46 -07:00
Jesse Suen
53897e5019 improvement: remove app name and project labels from reconcliation histogram to reduce cardinality (#3271) 2020-03-25 12:42:23 -07:00
Alexander Matyushentsev
7e0d8a490c fix: increase max connections count to support clusters with very large number of CRDs (#3278) 2020-03-25 10:03:40 -07:00
Alexander Matyushentsev
3684a10332 Update manifests to v1.5.0-rc1 2020-03-20 13:48:19 -07:00
10 changed files with 45 additions and 37 deletions

View File

@@ -1 +1 @@
1.6.0 1.5.4

View File

@@ -187,7 +187,7 @@
"ApplicationService" "ApplicationService"
], ],
"summary": "List returns list of applications", "summary": "List returns list of applications",
"operationId": "ListMixin8", "operationId": "List",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -237,7 +237,7 @@
"ApplicationService" "ApplicationService"
], ],
"summary": "Create creates an application", "summary": "Create creates an application",
"operationId": "CreateMixin8", "operationId": "Create",
"parameters": [ "parameters": [
{ {
"name": "body", "name": "body",
@@ -264,7 +264,7 @@
"ApplicationService" "ApplicationService"
], ],
"summary": "Update updates an application", "summary": "Update updates an application",
"operationId": "UpdateMixin8", "operationId": "Update",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -395,7 +395,7 @@
"ApplicationService" "ApplicationService"
], ],
"summary": "Get returns an application by name", "summary": "Get returns an application by name",
"operationId": "GetMixin8", "operationId": "Get",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -445,7 +445,7 @@
"ApplicationService" "ApplicationService"
], ],
"summary": "Delete deletes an application", "summary": "Delete deletes an application",
"operationId": "DeleteMixin8", "operationId": "Delete",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1084,7 +1084,7 @@
"ClusterService" "ClusterService"
], ],
"summary": "List returns list of clusters", "summary": "List returns list of clusters",
"operationId": "List", "operationId": "ListMixin4",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1106,7 +1106,7 @@
"ClusterService" "ClusterService"
], ],
"summary": "Create creates a cluster", "summary": "Create creates a cluster",
"operationId": "Create", "operationId": "CreateMixin4",
"parameters": [ "parameters": [
{ {
"name": "body", "name": "body",
@@ -1133,7 +1133,7 @@
"ClusterService" "ClusterService"
], ],
"summary": "Update updates a cluster", "summary": "Update updates a cluster",
"operationId": "Update", "operationId": "UpdateMixin4",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1166,7 +1166,7 @@
"ClusterService" "ClusterService"
], ],
"summary": "Get returns a cluster by server address", "summary": "Get returns a cluster by server address",
"operationId": "GetMixin2", "operationId": "GetMixin4",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1189,7 +1189,7 @@
"ClusterService" "ClusterService"
], ],
"summary": "Delete deletes a cluster", "summary": "Delete deletes a cluster",
"operationId": "Delete", "operationId": "DeleteMixin4",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1239,7 +1239,7 @@
"ProjectService" "ProjectService"
], ],
"summary": "List returns list of projects", "summary": "List returns list of projects",
"operationId": "ListMixin6", "operationId": "ListMixin5",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1261,7 +1261,7 @@
"ProjectService" "ProjectService"
], ],
"summary": "Create a new project.", "summary": "Create a new project.",
"operationId": "CreateMixin6", "operationId": "CreateMixin5",
"parameters": [ "parameters": [
{ {
"name": "body", "name": "body",
@@ -1288,7 +1288,7 @@
"ProjectService" "ProjectService"
], ],
"summary": "Get returns a project by name", "summary": "Get returns a project by name",
"operationId": "GetMixin6", "operationId": "GetMixin5",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1311,7 +1311,7 @@
"ProjectService" "ProjectService"
], ],
"summary": "Delete deletes a project", "summary": "Delete deletes a project",
"operationId": "DeleteMixin6", "operationId": "DeleteMixin5",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1386,7 +1386,7 @@
"ProjectService" "ProjectService"
], ],
"summary": "Update updates a project", "summary": "Update updates a project",
"operationId": "UpdateMixin6", "operationId": "UpdateMixin5",
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
@@ -1905,7 +1905,7 @@
"SettingsService" "SettingsService"
], ],
"summary": "Get returns Argo CD settings", "summary": "Get returns Argo CD settings",
"operationId": "Get", "operationId": "GetMixin7",
"responses": { "responses": {
"200": { "200": {
"description": "(empty)", "description": "(empty)",

View File

@@ -12,4 +12,4 @@ bases:
images: images:
- name: argoproj/argocd - name: argoproj/argocd
newName: argoproj/argocd newName: argoproj/argocd
newTag: latest newTag: v1.5.4

View File

@@ -18,4 +18,4 @@ bases:
images: images:
- name: argoproj/argocd - name: argoproj/argocd
newName: argoproj/argocd newName: argoproj/argocd
newTag: latest newTag: v1.5.4

View File

@@ -2869,7 +2869,7 @@ spec:
- "10" - "10"
- --redis - --redis
- argocd-redis-ha-haproxy:6379 - argocd-redis-ha-haproxy:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:
@@ -2925,7 +2925,7 @@ spec:
- -n - -n
- /usr/local/bin/argocd-util - /usr/local/bin/argocd-util
- /shared - /shared
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
name: copyutil name: copyutil
volumeMounts: volumeMounts:
@@ -2975,7 +2975,7 @@ spec:
- argocd-repo-server - argocd-repo-server
- --redis - --redis
- argocd-redis-ha-haproxy:6379 - argocd-redis-ha-haproxy:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
initialDelaySeconds: 5 initialDelaySeconds: 5
@@ -3043,7 +3043,7 @@ spec:
- /shared/app - /shared/app
- --redis - --redis
- argocd-redis-ha-haproxy:6379 - argocd-redis-ha-haproxy:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@@ -2784,7 +2784,7 @@ spec:
- "10" - "10"
- --redis - --redis
- argocd-redis-ha-haproxy:6379 - argocd-redis-ha-haproxy:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:
@@ -2840,7 +2840,7 @@ spec:
- -n - -n
- /usr/local/bin/argocd-util - /usr/local/bin/argocd-util
- /shared - /shared
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
name: copyutil name: copyutil
volumeMounts: volumeMounts:
@@ -2890,7 +2890,7 @@ spec:
- argocd-repo-server - argocd-repo-server
- --redis - --redis
- argocd-redis-ha-haproxy:6379 - argocd-redis-ha-haproxy:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
initialDelaySeconds: 5 initialDelaySeconds: 5
@@ -2958,7 +2958,7 @@ spec:
- /shared/app - /shared/app
- --redis - --redis
- argocd-redis-ha-haproxy:6379 - argocd-redis-ha-haproxy:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@@ -2369,7 +2369,7 @@ spec:
- "20" - "20"
- --operation-processors - --operation-processors
- "10" - "10"
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:
@@ -2425,7 +2425,7 @@ spec:
- -n - -n
- /usr/local/bin/argocd-util - /usr/local/bin/argocd-util
- /shared - /shared
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
name: copyutil name: copyutil
volumeMounts: volumeMounts:
@@ -2489,7 +2489,7 @@ spec:
- argocd-repo-server - argocd-repo-server
- --redis - --redis
- argocd-redis:6379 - argocd-redis:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
initialDelaySeconds: 5 initialDelaySeconds: 5
@@ -2540,7 +2540,7 @@ spec:
- argocd-server - argocd-server
- --staticassets - --staticassets
- /shared/app - /shared/app
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@@ -2284,7 +2284,7 @@ spec:
- "20" - "20"
- --operation-processors - --operation-processors
- "10" - "10"
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:
@@ -2340,7 +2340,7 @@ spec:
- -n - -n
- /usr/local/bin/argocd-util - /usr/local/bin/argocd-util
- /shared - /shared
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
name: copyutil name: copyutil
volumeMounts: volumeMounts:
@@ -2404,7 +2404,7 @@ spec:
- argocd-repo-server - argocd-repo-server
- --redis - --redis
- argocd-redis:6379 - argocd-redis:6379
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
initialDelaySeconds: 5 initialDelaySeconds: 5
@@ -2455,7 +2455,7 @@ spec:
- argocd-server - argocd-server
- --staticassets - --staticassets
- /shared/app - /shared/app
image: argoproj/argocd:latest image: argoproj/argocd:v1.5.4
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@@ -56,7 +56,15 @@ func (c *client) executeRequest(fullMethodName string, msg []byte, md metadata.M
schema = "http" schema = "http"
} }
rootPath := strings.TrimRight(strings.TrimLeft(c.GRPCWebRootPath, "/"), "/") rootPath := strings.TrimRight(strings.TrimLeft(c.GRPCWebRootPath, "/"), "/")
req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s://%s/%s%s", schema, c.ServerAddr, rootPath, fullMethodName), bytes.NewReader(toFrame(msg)))
var requestURL string
if rootPath != "" {
requestURL = fmt.Sprintf("%s://%s/%s%s", schema, c.ServerAddr, rootPath, fullMethodName)
} else {
requestURL = fmt.Sprintf("%s://%s%s", schema, c.ServerAddr, fullMethodName)
}
req, err := http.NewRequest(http.MethodPost, requestURL, bytes.NewReader(toFrame(msg)))
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -373,7 +373,7 @@ func (mgr *SessionManager) VerifyUsernamePassword(username string, password stri
// introduces random delay to protect from timing-based user enumeration attack // introduces random delay to protect from timing-based user enumeration attack
delayNanoseconds := verificationDelayNoiseMin.Nanoseconds() + delayNanoseconds := verificationDelayNoiseMin.Nanoseconds() +
int64(rand.Intn(int(verificationDelayNoiseMax.Nanoseconds()-verificationDelayNoiseMin.Nanoseconds()))) int64(rand.Intn(int(verificationDelayNoiseMax.Nanoseconds()-verificationDelayNoiseMin.Nanoseconds())))
// take into account amount of time spent since the request start // take into account amount of time spent since the request start
delayNanoseconds = delayNanoseconds - time.Since(start).Nanoseconds() delayNanoseconds = delayNanoseconds - time.Since(start).Nanoseconds()
if delayNanoseconds > 0 { if delayNanoseconds > 0 {
mgr.sleep(time.Duration(delayNanoseconds)) mgr.sleep(time.Duration(delayNanoseconds))