From afb690a81cbacf43f9fac26d3de090f758071982 Mon Sep 17 00:00:00 2001 From: Abhishek <47029841+garbagego@users.noreply.github.com> Date: Wed, 13 May 2020 19:14:11 +0530 Subject: [PATCH 1/4] modified port details for APIServerURL https://github.com/openshift/cluster-kube-apiserver-operator/pull/855# --- config/v1/types_infrastructure.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index baa5af37973..66efbbec635 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -67,7 +67,7 @@ type InfrastructureStatus struct { EtcdDiscoveryDomain string `json:"etcdDiscoveryDomain"` // apiServerURL is a valid URI with scheme(http/https), address and - // port. apiServerURL can be used by components like the web console + // port(only if not using default port HTTP 80 and HTTP/TLS 443). apiServerURL can be used by components like the web console // to tell users where to find the Kubernetes API. APIServerURL string `json:"apiServerURL"` From c8bc9530b5a15e06095746823221016148e9d314 Mon Sep 17 00:00:00 2001 From: Abhishek Abhishek Date: Sun, 31 May 2020 23:50:34 +0530 Subject: [PATCH 2/4] udated api doc with CRD --- config/v1/0000_10_config-operator_01_infrastructure.crd.yaml | 3 ++- config/v1/types_infrastructure.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml index 35e38f10377..51414a10720 100644 --- a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml +++ b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml @@ -158,7 +158,8 @@ spec: type: string apiServerURL: description: apiServerURL is a valid URI with scheme(http/https), address - and port. apiServerURL can be used by components like the web console + and port and optionally a port (defaulting to 80 for http and 443 + for https). apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API. type: string etcdDiscoveryDomain: diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 66efbbec635..9f121f1ac26 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -67,7 +67,7 @@ type InfrastructureStatus struct { EtcdDiscoveryDomain string `json:"etcdDiscoveryDomain"` // apiServerURL is a valid URI with scheme(http/https), address and - // port(only if not using default port HTTP 80 and HTTP/TLS 443). apiServerURL can be used by components like the web console + // port and optionally a port (defaulting to 80 for http and 443 for https). apiServerURL can be used by components like the web console // to tell users where to find the Kubernetes API. APIServerURL string `json:"apiServerURL"` From c6341789586fc2e0ae792d1eb70de72a3bc1917d Mon Sep 17 00:00:00 2001 From: garbagego Date: Tue, 2 Jun 2020 17:16:51 +0530 Subject: [PATCH 3/4] udated api doc with CRD --- .../v1/0000_10_config-operator_01_infrastructure.crd.yaml | 6 +++--- config/v1/types_infrastructure.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml index 51414a10720..301ee7f17a1 100644 --- a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml +++ b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml @@ -158,9 +158,9 @@ spec: type: string apiServerURL: description: apiServerURL is a valid URI with scheme(http/https), address - and port and optionally a port (defaulting to 80 for http and 443 - for https). apiServerURL can be used by components like the web console - to tell users where to find the Kubernetes API. + and optionally a port (defaulting to 80 for http and 443 for https). apiServerURL + can be used by components like the web console to tell users where + to find the Kubernetes API. type: string etcdDiscoveryDomain: description: 'etcdDiscoveryDomain is the domain used to fetch the SRV diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 9f121f1ac26..da2039ff1e0 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -67,7 +67,7 @@ type InfrastructureStatus struct { EtcdDiscoveryDomain string `json:"etcdDiscoveryDomain"` // apiServerURL is a valid URI with scheme(http/https), address and - // port and optionally a port (defaulting to 80 for http and 443 for https). apiServerURL can be used by components like the web console + // optionally a port (defaulting to 80 for http and 443 for https). apiServerURL can be used by components like the web console // to tell users where to find the Kubernetes API. APIServerURL string `json:"apiServerURL"` From 036dcf07ab4cfa6a17db3adddc4d0bbe97d9b82c Mon Sep 17 00:00:00 2001 From: Abhishek <47029841+garbagego@users.noreply.github.com> Date: Mon, 15 Jun 2020 20:18:33 +0530 Subject: [PATCH 4/4] updated apiServerURL details in swagger doc --- config/v1/zz_generated.swagger_doc_generated.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index 5e8eca32c29..3dd837dbf16 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -816,7 +816,7 @@ var map_InfrastructureStatus = map[string]string{ "platform": "platform is the underlying infrastructure provider for the cluster.\n\nDeprecated: Use platformStatus.type instead.", "platformStatus": "platformStatus holds status information specific to the underlying infrastructure provider.", "etcdDiscoveryDomain": "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery", - "apiServerURL": "apiServerURL is a valid URI with scheme(http/https), address and port. apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API.", + "apiServerURL": "apiServerURL is a valid URI with scheme(http/https), address and optionally a port (defaulting to 80 for http and 443 for https). apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API.", "apiServerInternalURI": "apiServerInternalURL is a valid URI with scheme(http/https), address and port. apiServerInternalURL can be used by components like kubelets, to contact the Kubernetes API server using the infrastructure provider rather than Kubernetes networking.", }