Compare commits

...

9 Commits

Author SHA1 Message Date
argo-bot
4c94d886f5 Bump version to 2.0.5 2021-07-22 20:44:44 +00:00
argo-bot
052e636ac8 Bump version to 2.0.5 2021-07-22 20:44:29 +00:00
ZymoticB
bf0b1286e2 fix: allow argocd-notification ingress to repo-server (#6746)
* Allow argocd-notification ingress to repo-server

This change allows an argocd-notification installation using the provided
manifests to ingress to the repo-server.

I am not sure if there is a prevailing opinion about how to manage a
cross project network policy for these related components so I thought
I would put up a PR to spark that discussion. This could live in a separate
NetworkPolicy object managed by the argocd-notifications manifests but I
thought it wuold be better for the possible ingresses for the argocd project
to all live in the argo-cd manifests. I know that notifications are an optional
component, so maybe this is better provided as a separate manifest that can
be strategic merged in? (I am a kustomize user).

Regardless, I think this policy is something that be maintained by argoproj
in some form to reduce release burden of users trying to hand maintain network
policies.

Signed-off-by: Tyler Dixon <tdixon@buf.build>

* make manifests

Signed-off-by: Tyler Dixon <tdixon@buf.build>
2021-07-22 13:04:28 -07:00
Alexander Matyushentsev
312f341a27 fix: argocd-server crashes due to nil pointer dereference (#6757)
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
2021-07-22 12:09:33 -07:00
Alexander Matyushentsev
4725473e37 fix: WebUI failure when loading pod view 't.parentRefs is undefined' (#6490) (#6535)
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
2021-07-22 12:06:47 -07:00
Alexander Matyushentsev
fae6150ab9 fix: prevent 'cannot read property "filter" of undefined' during nodes filtering (#6453)
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
2021-07-22 12:06:34 -07:00
Alexander Matyushentsev
eaa0c1ed61 fix: download Pod Logs button not honouring argocd-server rootpath (#6548) (#6627)
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
2021-07-12 09:10:05 -07:00
Saumeya Katyal
f5d9c76cae fix: Version warning banner in docs (#6682)
Signed-off-by: saumeya <saumeyakatyal@gmail.com>

add side-bar media queries

removed extra comments

Signed-off-by: saumeya <saumeyakatyal@gmail.com>
2021-07-11 13:15:25 +02:00
Alexander Matyushentsev
4488857988 fix: upgrade gitops engine to fix workflow health check
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
2021-06-23 15:19:24 -07:00
15 changed files with 64 additions and 29 deletions

View File

@@ -1 +1 @@
2.0.4
2.0.5

View File

@@ -36,10 +36,13 @@
/* Version Warning */
div[data-md-component=announce] {
background-color: rgba(255,145,0,.1);
background-color: rgb(248, 243, 236);
position: sticky;
top: 0;
z-index: 2;
}
div[data-md-component=announce]>div#announce-msg{
color: var(--md-admonition-fg-color);
color: var(--md-code-hl-number-color);
font-size: .8rem;
text-align: center;
margin: 15px;

View File

@@ -35,10 +35,24 @@ setTimeout(function() {
// VERSION WARNINGS
window.addEventListener("DOMContentLoaded", function() {
var rtdData = window['READTHEDOCS_DATA'] || { version: 'latest' };
var margin = 30;
var headerHeight = document.getElementsByClassName("md-header")[0].offsetHeight;
if (rtdData.version === "latest") {
document.querySelector("div[data-md-component=announce]").innerHTML = "<div id='announce-msg'>You are viewing the docs for an unreleased version of Argo CD, <a href='https://argo-cd.readthedocs.io/en/stable/'>click here to go to the latest stable version.</a></div>"
var bannerHeight = document.getElementById('announce-msg').offsetHeight + margin
document.querySelector("header.md-header").style.top = bannerHeight +"px";
document.querySelector('style').textContent +=
"@media screen and (min-width: 76.25em){ .md-sidebar { height: 0; top:"+ (bannerHeight+headerHeight)+"px !important; }}"
document.querySelector('style').textContent +=
"@media screen and (min-width: 60em){ .md-sidebar--secondary { height: 0; top:"+ (bannerHeight+headerHeight)+"px !important; }}"
}
else if (rtdData.version !== "stable") {
document.querySelector("div[data-md-component=announce]").innerHTML = "<div id='announce-msg'>You are viewing the docs for a previous version of Argo CD, <a href='https://argo-cd.readthedocs.io/en/stable/'>click here to go to the latest stable version.</a></div>"
var bannerHeight = document.getElementById('announce-msg').offsetHeight + margin
document.querySelector("header.md-header").style.top = bannerHeight +"px";
document.querySelector('style').textContent +=
"@media screen and (min-width: 76.25em){ .md-sidebar { height: 0; top:"+ (bannerHeight+headerHeight)+"px !important; }}"
document.querySelector('style').textContent +=
"@media screen and (min-width: 60em){ .md-sidebar--secondary { height: 0; top:"+ (bannerHeight+headerHeight)+"px !important; }}"
}
});

4
go.mod
View File

@@ -7,8 +7,8 @@ require (
github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
github.com/alicebob/miniredis v2.5.0+incompatible
github.com/alicebob/miniredis/v2 v2.14.2
github.com/argoproj/gitops-engine v0.3.2
github.com/argoproj/pkg v0.9.1-0.20210512035321-be5ba22dca5b
github.com/argoproj/gitops-engine v0.3.3
github.com/argoproj/pkg v0.9.1
github.com/bombsimon/logrusr v1.0.0
github.com/bradleyfalzon/ghinstallation v1.1.1
github.com/casbin/casbin v1.9.1

8
go.sum
View File

@@ -86,10 +86,10 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/argoproj/gitops-engine v0.3.2 h1:m5bjOk/bWwMsFBGFpurdK31/hC5UuLMQn0hAd51TlEk=
github.com/argoproj/gitops-engine v0.3.2/go.mod h1:IBHhAkqlC+3r/wBWUitWSidQhPzlLoSTWp2htq3dyQk=
github.com/argoproj/pkg v0.9.1-0.20210512035321-be5ba22dca5b h1:qtlM7ioAFP40LPN7A5ZqquVmAtv08LLSZTcCNYUQx8s=
github.com/argoproj/pkg v0.9.1-0.20210512035321-be5ba22dca5b/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=
github.com/argoproj/gitops-engine v0.3.3 h1:zRNwKRj3h+EBpciy/+Eyo4vW2GTG3UG4HXAdWn0mQRI=
github.com/argoproj/gitops-engine v0.3.3/go.mod h1:IBHhAkqlC+3r/wBWUitWSidQhPzlLoSTWp2htq3dyQk=
github.com/argoproj/pkg v0.9.1 h1:osfOS3QkzfRf+W43lbCZb0o0bzrBweQhL+U3rgEg+5M=
github.com/argoproj/pkg v0.9.1/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=

View File

@@ -5,7 +5,7 @@ kind: Kustomization
images:
- name: quay.io/argoproj/argocd
newName: quay.io/argoproj/argocd
newTag: v2.0.4
newTag: v2.0.5
resources:
- ./application-controller
- ./dex

View File

@@ -16,6 +16,9 @@ spec:
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-application-controller
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-notifications-controller
ports:
- protocol: TCP
port: 8081

View File

@@ -11,7 +11,7 @@ patchesStrategicMerge:
images:
- name: quay.io/argoproj/argocd
newName: quay.io/argoproj/argocd
newTag: v2.0.4
newTag: v2.0.5
resources:
- ../../base/application-controller
- ../../base/dex

View File

@@ -3178,7 +3178,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
name: copyutil
volumeMounts:
@@ -3312,7 +3312,7 @@ spec:
- argocd-repo-server
- --redis
- argocd-redis-ha-haproxy:6379
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -3413,7 +3413,7 @@ spec:
env:
- name: ARGOCD_API_SERVER_REPLICAS
value: "2"
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -3508,7 +3508,7 @@ spec:
- "10"
- --redis
- argocd-redis-ha-haproxy:6379
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -3794,6 +3794,9 @@ spec:
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-application-controller
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-notifications-controller
ports:
- port: 8081
protocol: TCP

View File

@@ -3093,7 +3093,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
name: copyutil
volumeMounts:
@@ -3227,7 +3227,7 @@ spec:
- argocd-repo-server
- --redis
- argocd-redis-ha-haproxy:6379
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -3328,7 +3328,7 @@ spec:
env:
- name: ARGOCD_API_SERVER_REPLICAS
value: "2"
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -3423,7 +3423,7 @@ spec:
- "10"
- --redis
- argocd-redis-ha-haproxy:6379
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -3709,6 +3709,9 @@ spec:
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-application-controller
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-notifications-controller
ports:
- port: 8081
protocol: TCP

View File

@@ -2544,7 +2544,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
name: copyutil
volumeMounts:
@@ -2644,7 +2644,7 @@ spec:
- argocd-repo-server
- --redis
- argocd-redis:6379
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -2740,7 +2740,7 @@ spec:
- argocd-server
- --staticassets
- /shared/app
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -2833,7 +2833,7 @@ spec:
- "20"
- --operation-processors
- "10"
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -2952,6 +2952,9 @@ spec:
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-application-controller
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-notifications-controller
ports:
- port: 8081
protocol: TCP

View File

@@ -2459,7 +2459,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
name: copyutil
volumeMounts:
@@ -2559,7 +2559,7 @@ spec:
- argocd-repo-server
- --redis
- argocd-redis:6379
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -2655,7 +2655,7 @@ spec:
- argocd-server
- --staticassets
- /shared/app
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -2748,7 +2748,7 @@ spec:
- "20"
- --operation-processors
- "10"
image: quay.io/argoproj/argocd:v2.0.4
image: quay.io/argoproj/argocd:v2.0.5
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -2867,6 +2867,9 @@ spec:
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-application-controller
- podSelector:
matchLabels:
app.kubernetes.io/name: argocd-notifications-controller
ports:
- port: 8081
protocol: TCP

View File

@@ -288,6 +288,9 @@ export class PodView extends React.Component<PodViewProps> {
this.props.app.status.resources.forEach(res => statusByKey.set(nodeKey(res), res));
}
(tree.nodes || []).forEach((rnode: ResourceTreeNode) => {
// make sure each node has not null/undefined parentRefs field
rnode.parentRefs = rnode.parentRefs || [];
if (sortMode !== 'node') {
parentsFor[rnode.uid] = rnode.parentRefs as PodGroup[];
const fullName = nodeKey(rnode);

View File

@@ -119,7 +119,7 @@ export function compareNodes(first: ResourceTreeNode, second: ResourceTreeNode)
return Math.sign(numberA - numberB);
}
function getRevision(a: ResourceTreeNode) {
const filtered = a.info.filter(b => b.name === 'Revision' && b)[0];
const filtered = (a.info || []).filter(b => b.name === 'Revision' && b)[0];
if (filtered == null) {
return '';
}

View File

@@ -180,7 +180,7 @@ export class ApplicationsService {
public getDownloadLogsURL(applicationName: string, namespace: string, podName: string, resource: {group: string; kind: string; name: string}, containerName: string): string {
const search = this.getLogsQuery(namespace, podName, resource, containerName, null, false);
search.set('download', 'true');
return `/api/v1/applications/${applicationName}/logs?${search.toString()}`;
return `api/v1/applications/${applicationName}/logs?${search.toString()}`;
}
public getContainerLogs(