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

Jump to bottom

fix: OpenShiftConfig missing some configurations from provided Config #3347

Merged
merged 1 commit into from
Jul 23, 2021
Merged

fix: OpenShiftConfig missing some configurations from provided Config #3347

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## CHANGELOG

### 5.6-SNAPSHOT
### 5.7-SNAPSHOT

#### Bugs
Fix : https configuration ignored for OpenShiftServer in CRUD mode
* Fix #3346: https configuration ignored for OpenShiftServer in CRUD mode
* Fix #3347: OpenShiftConfig missing some configurations from provided Config

#### Improvements

Expand Down
50 changes: 23 additions & 27 deletions openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.OAuthTokenProvider;
import io.fabric8.kubernetes.client.utils.URLUtils;
import io.fabric8.kubernetes.client.utils.Utils;
import io.sundr.builder.annotations.Buildable;
Expand Down Expand Up @@ -64,8 +65,8 @@ public OpenShiftConfig(Config kubernetesConfig, String openShiftUrl) {
}

@Buildable(builderPackage = "io.fabric8.kubernetes.api.builder", editableEnabled = false, refs = {@BuildableReference(Config.class)})
public OpenShiftConfig(String openShiftUrl, String oapiVersion, String masterUrl, String apiVersion, String namespace, boolean trustCerts, boolean disableHostnameVerification, String caCertFile, String caCertData, String clientCertFile, String clientCertData, String clientKeyFile, String clientKeyData, String clientKeyAlgo, String clientKeyPassphrase, String username, String password, String oauthToken, int watchReconnectInterval, int watchReconnectLimit, int connectionTimeout, int requestTimeout, long rollingTimeout, long scaleTimeout, int loggingInterval, Integer maxConcurrentRequests, Integer maxConcurrentRequestsPerHost, String httpProxy, String httpsProxy, String[] noProxy, Map<Integer, String> errorMessages, String userAgent, TlsVersion[] tlsVersions, long buildTimeout, long websocketTimeout, long websocketPingInterval, String proxyUsername, String proxyPassword, String trustStoreFile, String trustStorePassphrase, String keyStoreFile, String keyStorePassphrase, String impersonateUsername, String[] impersonateGroups, Map<String, List<String>> impersonateExtras, boolean openshiftApiGroupsEnabled, boolean disableApiGroupCheck) {
super(masterUrl, apiVersion, namespace, trustCerts, disableHostnameVerification, caCertFile, caCertData, clientCertFile, clientCertData, clientKeyFile, clientKeyData, clientKeyAlgo, clientKeyPassphrase, username, password, oauthToken, watchReconnectInterval, watchReconnectLimit, connectionTimeout, requestTimeout, rollingTimeout, scaleTimeout, loggingInterval, maxConcurrentRequests, maxConcurrentRequestsPerHost, httpProxy, httpsProxy, noProxy, errorMessages, userAgent, tlsVersions, websocketTimeout, websocketPingInterval, proxyUsername, proxyPassword, trustStoreFile, trustStorePassphrase, keyStoreFile, keyStorePassphrase, impersonateUsername, impersonateGroups, impersonateExtras);
public OpenShiftConfig(String openShiftUrl, String oapiVersion, String masterUrl, String apiVersion, String namespace, boolean trustCerts, boolean disableHostnameVerification, String caCertFile, String caCertData, String clientCertFile, String clientCertData, String clientKeyFile, String clientKeyData, String clientKeyAlgo, String clientKeyPassphrase, String username, String password, String oauthToken, int watchReconnectInterval, int watchReconnectLimit, int connectionTimeout, int requestTimeout, long rollingTimeout, long scaleTimeout, int loggingInterval, int maxConcurrentRequests, int maxConcurrentRequestsPerHost, boolean http2Disable, String httpProxy, String httpsProxy, String[] noProxy, Map<Integer, String> errorMessages, String userAgent, TlsVersion[] tlsVersions, long websocketTimeout, long websocketPingInterval, String proxyUsername, String proxyPassword, String trustStoreFile, String trustStorePassphrase, String keyStoreFile, String keyStorePassphrase, String impersonateUsername, String[] impersonateGroups, Map<String, List<String>> impersonateExtras, OAuthTokenProvider oauthTokenProvider, Map<String,String> customHeaders, int requestRetryBackoffLimit, int requestRetryBackoffInterval, int uploadConnectionTimeout, int uploadRequestTimeout, long buildTimeout, boolean openshiftApiGroupsEnabled, boolean disableApiGroupCheck) {
super(masterUrl, apiVersion, namespace, trustCerts, disableHostnameVerification, caCertFile, caCertData, clientCertFile, clientCertData, clientKeyFile, clientKeyData, clientKeyAlgo, clientKeyPassphrase, username, password, oauthToken, watchReconnectInterval, watchReconnectLimit, connectionTimeout, requestTimeout, rollingTimeout, scaleTimeout, loggingInterval, maxConcurrentRequests, maxConcurrentRequestsPerHost, http2Disable, httpProxy, httpsProxy, noProxy, errorMessages, userAgent, tlsVersions, websocketTimeout, websocketPingInterval, proxyUsername, proxyPassword, trustStoreFile, trustStorePassphrase, keyStoreFile, keyStorePassphrase, impersonateUsername, impersonateGroups, impersonateExtras, oauthTokenProvider, customHeaders, requestRetryBackoffLimit, requestRetryBackoffInterval, uploadConnectionTimeout, uploadRequestTimeout);
this.oapiVersion = oapiVersion;
this.openShiftUrl = openShiftUrl;
this.buildTimeout = buildTimeout;
Expand All @@ -81,36 +82,31 @@ public OpenShiftConfig(String openShiftUrl, String oapiVersion, String masterUrl
}

public OpenShiftConfig(Config kubernetesConfig, String openShiftUrl, String oapiVersion, long buildTimeout) {
this(openShiftUrl, oapiVersion, kubernetesConfig.getMasterUrl(), kubernetesConfig.getApiVersion(), kubernetesConfig.getNamespace(), kubernetesConfig.isTrustCerts(), kubernetesConfig.isDisableHostnameVerification(),
kubernetesConfig.getCaCertFile(), kubernetesConfig.getCaCertData(),
kubernetesConfig.getClientCertFile(), kubernetesConfig.getClientCertData(),
kubernetesConfig.getClientKeyFile(), kubernetesConfig.getClientKeyData(),
kubernetesConfig.getClientKeyAlgo(), kubernetesConfig.getClientKeyPassphrase(),
this(openShiftUrl, oapiVersion,
kubernetesConfig.getMasterUrl(), kubernetesConfig.getApiVersion(),
kubernetesConfig.getNamespace(), kubernetesConfig.isTrustCerts(),
kubernetesConfig.isDisableHostnameVerification(), kubernetesConfig.getCaCertFile(),
kubernetesConfig.getCaCertData(), kubernetesConfig.getClientCertFile(),
kubernetesConfig.getClientCertData(), kubernetesConfig.getClientKeyFile(),
kubernetesConfig.getClientKeyData(), kubernetesConfig.getClientKeyAlgo(), kubernetesConfig.getClientKeyPassphrase(),
kubernetesConfig.getUsername(), kubernetesConfig.getPassword(), kubernetesConfig.getOauthToken(),
kubernetesConfig.getWatchReconnectInterval(), kubernetesConfig.getWatchReconnectLimit(),
kubernetesConfig.getConnectionTimeout(), kubernetesConfig.getRequestTimeout(),
kubernetesConfig.getRollingTimeout(), kubernetesConfig.getScaleTimeout(),
kubernetesConfig.getLoggingInterval(),
kubernetesConfig.getMaxConcurrentRequests(),
kubernetesConfig.getMaxConcurrentRequestsPerHost(),
kubernetesConfig.getHttpProxy(),
kubernetesConfig.getHttpsProxy(),
kubernetesConfig.getNoProxy(),
kubernetesConfig.getErrorMessages(),
kubernetesConfig.getUserAgent(),
kubernetesConfig.getTlsVersions(),
kubernetesConfig.getLoggingInterval(), kubernetesConfig.getMaxConcurrentRequests(),
kubernetesConfig.getMaxConcurrentRequestsPerHost(), kubernetesConfig.isHttp2Disable(),
kubernetesConfig.getHttpProxy(), kubernetesConfig.getHttpsProxy(), kubernetesConfig.getNoProxy(),
kubernetesConfig.getErrorMessages(), kubernetesConfig.getUserAgent(),
kubernetesConfig.getTlsVersions(), kubernetesConfig.getWebsocketTimeout(),
kubernetesConfig.getWebsocketPingInterval(), kubernetesConfig.getProxyUsername(),
kubernetesConfig.getProxyPassword(), kubernetesConfig.getTrustStoreFile(),
kubernetesConfig.getTrustStorePassphrase(), kubernetesConfig.getKeyStoreFile(),
kubernetesConfig.getKeyStorePassphrase(), kubernetesConfig.getImpersonateUsername(),
kubernetesConfig.getImpersonateGroups(), kubernetesConfig.getImpersonateExtras(),
kubernetesConfig.getOauthTokenProvider(), kubernetesConfig.getCustomHeaders(),
kubernetesConfig.getRequestRetryBackoffLimit(), kubernetesConfig.getRequestRetryBackoffInterval(),
kubernetesConfig.getUploadConnectionTimeout(), kubernetesConfig.getUploadRequestTimeout(),
buildTimeout,
kubernetesConfig.getWebsocketTimeout(),
kubernetesConfig.getWebsocketPingInterval(),
kubernetesConfig.getProxyUsername(),
kubernetesConfig.getProxyPassword(),
kubernetesConfig.getTrustStoreFile(),
kubernetesConfig.getTrustStorePassphrase(),
kubernetesConfig.getKeyStoreFile(),
kubernetesConfig.getKeyStorePassphrase(),
kubernetesConfig.getImpersonateUsername(),
kubernetesConfig.getImpersonateGroups(),
kubernetesConfig.getImpersonateExtras(),
false,
false
);
Expand Down