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: core-install.yaml always refers to latest argocd image #7321

Merged
merged 1 commit into from Sep 29, 2021

Conversation

alexmt
Copy link
Collaborator

@alexmt alexmt commented Sep 29, 2021

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

Closes #7278

@alexmt alexmt added the cherry-pick/2.1 Candidate for cherry picking into the 2.1 release branch label Sep 29, 2021
Copy link
Contributor

@mayzhang2000 mayzhang2000 left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
@alexmt alexmt force-pushed the 7278-headless-install-manifests branch from 5884b9c to dfd8afb Compare September 29, 2021 20:17
@codecov
Copy link

codecov bot commented Sep 29, 2021

Codecov Report

Merging #7321 (dfd8afb) into master (94372ad) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7321   +/-   ##
=======================================
  Coverage   41.17%   41.17%           
=======================================
  Files         161      161           
  Lines       21612    21612           
=======================================
  Hits         8899     8899           
  Misses      11446    11446           
  Partials     1267     1267           

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 94372ad...dfd8afb. Read the comment docs.

@alexmt alexmt merged commit 1842c98 into argoproj:master Sep 29, 2021
alexmt pushed a commit that referenced this pull request Sep 29, 2021
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
@alexmt alexmt deleted the 7278-headless-install-manifests branch September 29, 2021 21:06
@edwardcookemacu
Copy link

Doesn't this change make it so that if someone uses the v2.1.3 install manifests it would actually install the latest image, like a v2.3.5 or whatever version which may or may not work with the v2.1.3. Or am I missing something?

@alexmt
Copy link
Collaborator Author

alexmt commented Sep 30, 2021

This change updates the shell script which is used during release time and updates image in manifests in release branch. The most recent release has correct image in core-install.yaml:

curl -s https://raw.githubusercontent.com/argoproj/argo-cd/v2.1.3/manifests/core-install.yaml | grep 'image:'                                  
        image: redis:6.2.4-alpine
        image: quay.io/argoproj/argocd:v2.1.3
        image: quay.io/argoproj/argocd:v2.1.3

@edwardcookemacu
Copy link

I was meaning manifest in the v2.1.3 tag. So we need to reference the release-2.1 branch and use that manifest and not the release tag now? Because your release notes reference the v2.1.3 tag and not release-2.1 branch.

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
cherry-pick/2.1 Candidate for cherry picking into the 2.1 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

core-install.yaml always refers to latest argocd image
3 participants