Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: argocd admin export cmd error on applicationsets.argoproj.io #7306

Merged
merged 1 commit into from Sep 29, 2021

Conversation

chetan-rns
Copy link
Member

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Closes: #7276

Checks for errors when accessing ApplicationSets. Log a warning message and continue when the user :

  1. Doesn't have enough permissions to access ApplicationSets
  2. Not installed ApplicationSets (CRDs are absent)

Signed-off-by: Chetan Banavikalmutt <chetanrns1997@gmail.com>
@codecov
Copy link

codecov bot commented Sep 28, 2021

Codecov Report

Merging #7306 (f6150e8) into master (917d079) will decrease coverage by 0.05%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7306      +/-   ##
==========================================
- Coverage   41.10%   41.04%   -0.06%     
==========================================
  Files         160      160              
  Lines       21505    21536      +31     
==========================================
  Hits         8840     8840              
- Misses      11399    11430      +31     
  Partials     1266     1266              
Impacted Files Coverage Δ
cmd/argocd/commands/admin/backup.go 0.00% <0.00%> (ø)
util/settings/settings.go 46.94% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 917d079...f6150e8. Read the comment docs.

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the bug fix!

@alexmt alexmt merged commit 94372ad into argoproj:master Sep 29, 2021
alexmt pushed a commit that referenced this pull request Sep 29, 2021
Signed-off-by: Chetan Banavikalmutt <chetanrns1997@gmail.com>
mickkael pushed a commit to mickkael/argo-cd that referenced this pull request Oct 4, 2021
Tagger: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Date:   Wed Sep 29 14:43:42 2021 -0700

## Quick Start

### Non-HA:

```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/install.yaml
```

#### HA:
```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/ha/install.yaml
```

#### Bug Fixes

- fix: core-install.yaml always refers to latest argocd image (argoproj#7321)
- fix: handle applicationset backup forbidden error (argoproj#7306)
- fix: Argo CD should not use cached git/helm revision during app creation/update validation (argoproj#7244)

commit 053bfbe
Author: Alexander Matyushentsev <Alexander_Matyushentsev@intuit.com>
Date:   Wed Sep 29 14:05:18 2021 -0700

    fix: core-install.yaml always refers to latest argocd image (argoproj#7321)

    Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

diff --git a/hack/update-manifests.sh b/hack/update-manifests.sh
index 0d4e37e9c..b2fafb3d5 100755
--- a/hack/update-manifests.sh
+++ b/hack/update-manifests.sh
@@ -31,6 +31,7 @@ $KUSTOMIZE version

 cd ${SRCROOT}/manifests/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
 cd ${SRCROOT}/manifests/ha/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+cd ${SRCROOT}/manifests/core-install && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}

 echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/install.yaml"
 $KUSTOMIZE build "${SRCROOT}/manifests/cluster-install" >> "${SRCROOT}/manifests/install.yaml"
diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml
index e6b768c65..f502d9beb 100644
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -7,4 +7,8 @@ resources:
 - ../base/config
 - ../base/application-controller
 - ../base/repo-server
-- ../base/redis
\ No newline at end of file
+- ../base/redis
+images:
+- name: quay.io/argoproj/argocd
+  newName: quay.io/argoproj/argocd
+  newTag: latest
============ END COMMIT MESSAGE ==============
============BEGIN RELEASE NOTES=================
## Quick Start

### Non-HA:

```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/install.yaml
```

#### HA:
```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/ha/install.yaml
```

#### Bug Fixes

- fix: core-install.yaml always refers to latest argocd image (argoproj#7321)
- fix: handle applicationset backup forbidden error (argoproj#7306)
- fix: Argo CD should not use cached git/helm revision during app creation/update validation (argoproj#7244)
mickkael pushed a commit to mickkael/argo-cd that referenced this pull request Oct 4, 2021
Tagger: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Date:   Wed Sep 29 14:43:42 2021 -0700

## Quick Start

### Non-HA:

```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/install.yaml
```

#### HA:
```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/ha/install.yaml
```

#### Bug Fixes

- fix: core-install.yaml always refers to latest argocd image (argoproj#7321)
- fix: handle applicationset backup forbidden error (argoproj#7306)
- fix: Argo CD should not use cached git/helm revision during app creation/update validation (argoproj#7244)

commit 053bfbe
Author: Alexander Matyushentsev <Alexander_Matyushentsev@intuit.com>
Date:   Wed Sep 29 14:05:18 2021 -0700

    fix: core-install.yaml always refers to latest argocd image (argoproj#7321)

    Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

diff --git a/hack/update-manifests.sh b/hack/update-manifests.sh
index 0d4e37e9c..b2fafb3d5 100755
--- a/hack/update-manifests.sh
+++ b/hack/update-manifests.sh
@@ -31,6 +31,7 @@ $KUSTOMIZE version

 cd ${SRCROOT}/manifests/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
 cd ${SRCROOT}/manifests/ha/base && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}
+cd ${SRCROOT}/manifests/core-install && $KUSTOMIZE edit set image quay.io/argoproj/argocd=${IMAGE_NAMESPACE}/argocd:${IMAGE_TAG}

 echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/install.yaml"
 $KUSTOMIZE build "${SRCROOT}/manifests/cluster-install" >> "${SRCROOT}/manifests/install.yaml"
diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml
index e6b768c65..f502d9beb 100644
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -7,4 +7,8 @@ resources:
 - ../base/config
 - ../base/application-controller
 - ../base/repo-server
-- ../base/redis
\ No newline at end of file
+- ../base/redis
+images:
+- name: quay.io/argoproj/argocd
+  newName: quay.io/argoproj/argocd
+  newTag: latest
============ END COMMIT MESSAGE ==============
============BEGIN RELEASE NOTES=================
## Quick Start

### Non-HA:

```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/install.yaml
```

#### HA:
```bash
kubectl create namespace argocd
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/ha/install.yaml
```

#### Bug Fixes

- fix: core-install.yaml always refers to latest argocd image (argoproj#7321)
- fix: handle applicationset backup forbidden error (argoproj#7306)
- fix: Argo CD should not use cached git/helm revision during app creation/update validation (argoproj#7244)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

argocd admin export error on applicationsets.argoproj.io
2 participants