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.

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

Use properties che.api.{external,internal} if exist. #13774

Closed
wants to merge 1 commit into from
+20 −4
Closed

Use properties che.api.{external,internal} if exist. #13774

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
12 changes: 10 additions & 2 deletions ...workspace/infrastructure/kubernetes/provision/KubernetesCheApiExternalEnvVarProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*/
package org.eclipse.che.workspace.infrastructure.kubernetes.provision;

import static com.google.common.base.Strings.isNullOrEmpty;

import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
Expand All @@ -28,8 +30,14 @@ public class KubernetesCheApiExternalEnvVarProvider implements CheApiExternalEnv
private final String cheServerEndpoint;

@Inject
public KubernetesCheApiExternalEnvVarProvider(@Named("che.api") String cheServerEndpoint) {
this.cheServerEndpoint = cheServerEndpoint;
public KubernetesCheApiExternalEnvVarProvider(
@Named("che.api") String cheServerEndpoint,
@Named("che.api.external") String cheServerExternalEndpoint) {
if (isNullOrEmpty(cheServerExternalEndpoint)) {
this.cheServerEndpoint = cheServerEndpoint;
} else {
this.cheServerEndpoint = cheServerExternalEndpoint;
}
}

@Override
Expand Down
12 changes: 10 additions & 2 deletions ...workspace/infrastructure/kubernetes/provision/KubernetesCheApiInternalEnvVarProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*/
package org.eclipse.che.workspace.infrastructure.kubernetes.provision;

import static com.google.common.base.Strings.isNullOrEmpty;

import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
Expand All @@ -28,8 +30,14 @@ public class KubernetesCheApiInternalEnvVarProvider implements CheApiInternalEnv
private final String cheServerEndpoint;

@Inject
public KubernetesCheApiInternalEnvVarProvider(@Named("che.api") String cheServerEndpoint) {
this.cheServerEndpoint = cheServerEndpoint;
public KubernetesCheApiInternalEnvVarProvider(
@Named("che.api") String cheServerEndpoint,
@Named("che.api.internal") String cheServerInternalEndpoint) {
if (isNullOrEmpty(cheServerInternalEndpoint)) {
this.cheServerEndpoint = cheServerEndpoint;
} else {
this.cheServerEndpoint = cheServerInternalEndpoint;
}
}

@Override
Expand Down