mirror of
https://github.com/argoproj/argo-cd.git
synced 2026-04-03 07:18:49 +02:00
Compare commits
27 Commits
commit-ser
...
v1.5.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36bade7a2d | ||
|
|
5754bd3357 | ||
|
|
095c5d616b | ||
|
|
c3b3a0fc58 | ||
|
|
c2c19f42ad | ||
|
|
8a3b36bd28 | ||
|
|
35a7350b74 | ||
|
|
241e6d0a6e | ||
|
|
dbd6b406ac | ||
|
|
a069639135 | ||
|
|
76241f9d3b | ||
|
|
bdda410463 | ||
|
|
2faa5c89d1 | ||
|
|
a12b7bdb74 | ||
|
|
9b21c25783 | ||
|
|
e1deca2a9e | ||
|
|
62621428b1 | ||
|
|
ab1f9e4658 | ||
|
|
36d1b42d5c | ||
|
|
8b9d25f6e3 | ||
|
|
323af4d562 | ||
|
|
a946b70b5e | ||
|
|
f9f1bdaabe | ||
|
|
e66b6109f7 | ||
|
|
53897e5019 | ||
|
|
7e0d8a490c | ||
|
|
3684a10332 |
@@ -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)",
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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))
|
||||||
|
|||||||
Reference in New Issue
Block a user