Skip to content

sync: main to rhdp-deploy #466

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Sep 18, 2025
Merged

sync: main to rhdp-deploy #466

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4bc4545
Default TOKEN_NAMESPACE to openshift-operators
mbaldessari Sep 18, 2025
5aa04ff
Merge pull request #634 from mbaldessari/simpler-secret
mbaldessari Sep 18, 2025
9048ed8
Merge remote-tracking branch 'common-upstream/main' into common-autom…
mbaldessari Sep 18, 2025
39bf3ef
Merge pull request #465 from mbaldessari/common-automatic-update
mbaldessari Sep 18, 2025
b1663ad
Disable validate_origin if a token_secret is set
mbaldessari Sep 18, 2025
f5f3d01
Merge pull request #635 from mbaldessari/simpler-validation
mbaldessari Sep 18, 2025
dd8cea4
Merge remote-tracking branch 'common-upstream/main' into common-autom…
mbaldessari Sep 18, 2025
2f93c06
Merge pull request #467 from mbaldessari/common-automatic-update
mbaldessari Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions common/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ ifneq ($(origin TARGET_SITE), undefined)
TARGET_SITE_OPT=--set main.clusterGroupName=$(TARGET_SITE)
endif

# Set this to true if you want to skip any origin validation
DISABLE_VALIDATE_ORIGIN ?= false
ifeq ($(DISABLE_VALIDATE_ORIGIN),true)
VALIDATE_ORIGIN :=
else
VALIDATE_ORIGIN := validate-origin
endif

# This variable can be set in order to pass additional helm arguments from the
# the command line. I.e. we can set things without having to tweak values files
EXTRA_HELM_OPTS ?=
Expand Down Expand Up @@ -46,7 +38,19 @@ endif
# Set the secret name *and* its namespace when deploying from private repositories
# The format of said secret is documented here: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#repositories
TOKEN_SECRET ?=
TOKEN_NAMESPACE ?=
TOKEN_NAMESPACE ?= openshift-operators

# Set this to true if you want to skip any origin validation
# if TOKEN_SECRET is set to something then we skip the validation as well
DISABLE_VALIDATE_ORIGIN ?= false
ifeq ($(DISABLE_VALIDATE_ORIGIN),true)
VALIDATE_ORIGIN :=
else ifneq ($(TOKEN_SECRET),)
VALIDATE_ORIGIN :=
else
VALIDATE_ORIGIN := validate-origin
endif


ifeq ($(TOKEN_SECRET),)
# SSH agents are not created for public repos (repos with no secret token) by the patterns operator so we convert to HTTPS
Expand Down