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: Argo CD should not use cached git/helm revision during app creation/update validation #7244

Merged
merged 1 commit into from Sep 17, 2021

Conversation

alexmt
Copy link
Collaborator

@alexmt alexmt commented Sep 17, 2021

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

As of v2.1 Argo CD caches resolved revisions. Cache is refreshed every 3 mins, if refresh is requested explicitly. The PR introduces cache refresh when application changed/created.

…ion/update validation

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

codecov bot commented Sep 17, 2021

Codecov Report

Merging #7244 (db04a11) into master (b26e928) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7244   +/-   ##
=======================================
  Coverage   41.08%   41.08%           
=======================================
  Files         160      160           
  Lines       21474    21475    +1     
=======================================
+ Hits         8822     8823    +1     
  Misses      11387    11387           
  Partials     1265     1265           
Impacted Files Coverage Δ
reposerver/repository/repository.go 60.84% <100.00%> (ø)
util/argo/argo.go 63.43% <100.00%> (+0.10%) ⬆️
util/settings/settings.go 47.15% <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 b26e928...db04a11. Read the comment docs.

@alexmt alexmt merged commit 183d729 into argoproj:master Sep 17, 2021
@alexmt alexmt deleted the no-cache-on-app-change branch September 17, 2021 01:35
alexmt pushed a commit that referenced this pull request Sep 17, 2021
…ion/update validation (#7244)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
plakyda-codefresh pushed a commit to plakyda-codefresh/argo-cd that referenced this pull request Sep 21, 2021
…ion/update validation (argoproj#7244)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: viktorplakida <plakyda1@gmail.com>
plakyda-codefresh pushed a commit to plakyda-codefresh/argo-cd that referenced this pull request Sep 28, 2021
…ion/update validation (argoproj#7244)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: viktorplakida <plakyda1@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.

None yet

2 participants