Skip to content

Conditionally activate proxies #2263

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

Closed
rnc wants to merge 1 commit into from
Closed

Conditionally activate proxies #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions deploy/tasks/maven-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ spec:
key: mavenpassword
- name: ACCESS_TOKEN
value: $(params.ACCESS_TOKEN)
- name: PROXY_ENABLED
value: "false"
args:
- deploy
- --directory=/var/workdir/deployment
Expand Down
7 changes: 4 additions & 3 deletions ...sor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ public void run() {
export HOME=${HOME:=/root}
# Custom base working directory.
export JBS_WORKDIR=${JBS_WORKDIR:=/var/workdir/workspace}
# TODO: Until domain-proxy is implemented disable this
export PROXY_ENABLED=false

export LANG="en_US.UTF-8"
export LC_ALL="en_US.UTF-8"
Expand Down Expand Up @@ -302,8 +304,7 @@ private String getMavenSetup() {
<proxies>
<proxy>
<id>indy-http</id>
<!-- TODO: Until domain-proxy is implemented disable this - probably needs conditional activation but settings profiles don't support interpolation -->
<active>false</active>
<active>${PROXY_ENABLED}</active>
<protocol>http</protocol>
<host>domain-proxy</host>
<port>80</port>
Expand All @@ -314,7 +315,7 @@ private String getMavenSetup() {
</proxy>
<proxy>
<id>indy-https</id>
<active>false</active>
<active>${PROXY_ENABLED}</active>
<protocol>https</protocol>
<host>domain-proxy</host>
<port>80</port>
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ const (
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/PROXY/deploy/tasks/maven-deployment.yaml"
)
Loading