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

chore: backport documentation changes to v3.5.2 #12450

Merged

Conversation

jmeridth
Copy link
Member

@jmeridth jmeridth commented Jan 3, 2024

Motivation

relates to #12414

Modifications

  • move over files to help with readthedocs build
    • .readthedocs.yaml
    • Makefile
    • mkdocs.yml
    • hack/check-mkdocs.sh
    • docs/requirements.txt
  • change links from github pages to readthedocs v3.5.2

Verification

relates to argoproj#12414

- [x] move over files to help with readthedocs build
  - [x] .readthedocs.yaml
  - [x] Makefile
  - [x] mkdocs.yml
  - [x] hack/check-mkdocs.sh
  - [x] docs/requirements.txt
- [x] change links from github pages to readthedocs v3.5.2

Signed-off-by: jmeridth <[email protected]>
@terrytangyuan
Copy link
Member

LGTM

@terrytangyuan terrytangyuan merged commit 2f6cf2c into argoproj:release-3.5.2 Jan 3, 2024
6 checks passed
@jmeridth
Copy link
Member Author

jmeridth commented Jan 3, 2024

@terrytangyuan will we move the tag for v3.5.2 to this new SHA (aka HEAD of release-3.5.2 branch)?

@jmeridth jmeridth deleted the jm-backport-doc-changes branch January 3, 2024 19:07
@terrytangyuan
Copy link
Member

I don't think that's possible

@terrytangyuan
Copy link
Member

We should only create new tags instead of modifying existing ones

@agilgur5
Copy link
Member

agilgur5 commented Jan 4, 2024

I've mentioned this before, but ideally we should use a versioned branch that we can make tags off of.

For instance, we could have 3.5.x and any backports and patches would target that. We could also use that branch for the docs (unless RTD doesn't support that?)

I don't think that's possible
We should only create new tags instead of modifying existing ones

It is possible, though generally not preferred. This is one of those edge cases where changing it does make sense though. Otherwise, we can tag release-3.5.2-docs or something. A 3.5.x branch is probably optimal if RTD supports it

@agilgur5
Copy link
Member

agilgur5 commented Jan 4, 2024

Ah looks like Argo CD has the release-3.5 -style branch for each minor that I think it would make sense for us to use as well. See my comment in #12414 (comment) for screenshots/examples of that

* [Infrastructure automation](https://argoproj.github.io/argo-workflows/use-cases/infrastructure-automation/)
* [CI/CD](https://argoproj.github.io/argo-workflows/use-cases/ci-cd/)
* [Other use cases](https://argoproj.github.io/argo-workflows/use-cases/other/)
* [Machine Learning pipelines](https://argo-workflows.readthedocs.io/en/v3.5.2/use-cases/machine-learning/)
Copy link
Member

Choose a reason for hiding this comment

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

Ah I see, these changes will impact people who navigate to the release-3.5 branch directly for the examples and docs.

The source code changes would only affect the next version of the binary though, which would be v3.5.3 at that time. Hmmm... using release-3.5 or 3.5.x for the version number in the docs permalink may make the most sense then

@agilgur5 agilgur5 added area/docs Incorrect, missing, or mistakes in docs area/build Build or GithubAction/CI issues labels Jan 4, 2024
@terrytangyuan
Copy link
Member

We do have those release branches. The problem is modifying an existing tag.

@terrytangyuan
Copy link
Member

@agilgur5
Copy link
Member

agilgur5 commented Jan 4, 2024

See https://github.com/argoproj/argo-workflows/branches/all?query=release

It looks like we're currently using release-3.5 as tracking v3.5.0 specifically though (the .0 patch as in), as opposed to the minor as a whole, since it is behind release-3.5.2.
If we use the branch in RTD instead of a tag, then I think we should cover most of the bases

@terrytangyuan
Copy link
Member

Can we use a branch? Then it is as simple as syncing release-3.5 branch to be up-to-date with 3.5.2

@agilgur5
Copy link
Member

agilgur5 commented Jan 4, 2024

Looks like we can indeed use a branch:

Screenshot 2024-01-03 at 9 50 07 PM

@jmeridth
Copy link
Member Author

jmeridth commented Jan 4, 2024

Yes we can use a branch but I need to issue another PR to change the URL to /release-3.5.2 instead of /v3.5.2. Why can't we move the tag? I'm not understanding that. Shouldn't the tag point to the head of its release branch?

@jmeridth
Copy link
Member Author

jmeridth commented Jan 4, 2024

Nm. I see @agilgur5's comment here. We should match ArgoCD

@agilgur5
Copy link
Member

agilgur5 commented Jan 4, 2024

Why can't we move the tag? I'm not understanding that.

A tag is supposed to be a stable reference, as opposed to a branch. Some artifact registries don't allow changing tags either (like NPM, for instance).
Git/Go and Docker/OCI registries actually have mutable references however, which is why using a SHA or digest in addition to the version number is a general recommendation for supply chain security purposes for those registries (see also #12031 "Pinned Dependencies").

But for most intents, you typically want tags to be immutable.
This is an edge case where I'd support moving it, although as we're not making a new GH release of the binary etc, I'd rather keep things consistent where possible. And if we're just doing the minor branch then we can leave the tag as immutable.

The branch won't cover all the bases (i.e. old versions of the binary and old release tags will still point to GH Pages), but it'll cover all the most important ones, which is "good enough" IMO. Everything else will get redirected to latest, which matches the previous behavior anyway

@agilgur5
Copy link
Member

agilgur5 commented Jan 4, 2024

Follow-up PR in #12460

@agilgur5 agilgur5 added the type/backport Backport of an existing PR to an older release branch label Mar 9, 2024
@agilgur5 agilgur5 added this to the v3.5.x patches milestone Apr 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build Build or GithubAction/CI issues area/docs Incorrect, missing, or mistakes in docs type/backport Backport of an existing PR to an older release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants