Compare commits

...

2 Commits

9 changed files with 347 additions and 56 deletions

View File

@@ -1,5 +1,8 @@
# Changelog
## v0.7.2 (2018-08-21)
- API discovery becomes best effort when partial resource list is returned (issue #524)
## v0.7.1 (2018-08-03)
+ Surface helm parameters to the application level (#485)
+ [UI] Improve application creation wizard (#459)

370
Gopkg.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
0.7.1
0.7.2

View File

@@ -204,7 +204,7 @@ func retryUntilSucceed(action func() error, desc string, ctx context.Context, ti
log.Infof("Stop retrying %s", desc)
return
} else {
log.Warnf("Failed to %s: %v, retrying in %v", desc, err, timeout)
log.Warnf("Failed to %s: %+v, retrying in %v", desc, err, timeout)
time.Sleep(timeout)
}
}

View File

@@ -14,6 +14,6 @@ spec:
spec:
containers:
- command: [/argocd-application-controller, --repo-server, 'argocd-repo-server:8081']
image: argoproj/argocd-application-controller:v0.7.1
image: argoproj/argocd-application-controller:v0.7.2
name: application-controller
serviceAccountName: application-controller

View File

@@ -15,20 +15,20 @@ spec:
serviceAccountName: argocd-server
initContainers:
- name: copyutil
image: argoproj/argocd-server:v0.7.1
image: argoproj/argocd-server:v0.7.2
command: [cp, /argocd-util, /shared]
volumeMounts:
- mountPath: /shared
name: static-files
- name: ui
image: argoproj/argocd-ui:v0.7.1
image: argoproj/argocd-ui:v0.7.2
command: [cp, -r, /app, /shared]
volumeMounts:
- mountPath: /shared
name: static-files
containers:
- name: argocd-server
image: argoproj/argocd-server:v0.7.1
image: argoproj/argocd-server:v0.7.2
command: [/argocd-server, --staticassets, /shared/app, --repo-server, 'argocd-repo-server:8081']
volumeMounts:
- mountPath: /shared

View File

@@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: argocd-repo-server
image: argoproj/argocd-repo-server:v0.7.1
image: argoproj/argocd-repo-server:v0.7.2
command: [/argocd-repo-server]
ports:
- containerPort: 8081

View File

@@ -162,7 +162,7 @@ spec:
spec:
containers:
- command: [/argocd-application-controller, --repo-server, 'argocd-repo-server:8081']
image: argoproj/argocd-application-controller:v0.7.1
image: argoproj/argocd-application-controller:v0.7.2
name: application-controller
serviceAccountName: application-controller
---
@@ -238,20 +238,20 @@ spec:
serviceAccountName: argocd-server
initContainers:
- name: copyutil
image: argoproj/argocd-server:v0.7.1
image: argoproj/argocd-server:v0.7.2
command: [cp, /argocd-util, /shared]
volumeMounts:
- mountPath: /shared
name: static-files
- name: ui
image: argoproj/argocd-ui:v0.7.1
image: argoproj/argocd-ui:v0.7.2
command: [cp, -r, /app, /shared]
volumeMounts:
- mountPath: /shared
name: static-files
containers:
- name: argocd-server
image: argoproj/argocd-server:v0.7.1
image: argoproj/argocd-server:v0.7.2
command: [/argocd-server, --staticassets, /shared/app, --repo-server, 'argocd-repo-server:8081']
volumeMounts:
- mountPath: /shared
@@ -298,7 +298,7 @@ spec:
spec:
containers:
- name: argocd-repo-server
image: argoproj/argocd-repo-server:v0.7.1
image: argoproj/argocd-repo-server:v0.7.2
command: [/argocd-repo-server]
ports:
- containerPort: 8081

View File

@@ -174,7 +174,11 @@ func GetCachedServerResources(host string, disco discovery.DiscoveryInterface) (
}
resList, err = disco.ServerResources()
if err != nil {
return nil, errors.WithStack(err)
if len(resList) == 0 {
return nil, errors.WithStack(err)
}
// It's possible for ServerResources to return error as well as a resource list
log.Warnf("Resource discovery partially successful. Encountered error: %v", err)
}
err = apiResourceCache.Set(&cache.Item{
Key: cacheKey,