Skip to content

Commit a4aa9df

Browse files
committed
Use fully qualified name of cluster
`hiding` doesn't work in ghc <=8.4.4 if the module uses `DuplicateRecordFields`.
1 parent f027452 commit a4aa9df

File tree

1 file changed

+4
-4
lines changed
  • kubernetes-client/src/Kubernetes/Client

1 file changed

+4
-4
lines changed

kubernetes-client/src/Kubernetes/Client/Config.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module Kubernetes.Client.Config
66
, addCACertFile
77
, applyAuthSettings
88
, clientHooksL
9-
, cluster
9+
, Kubernetes.Client.Config.cluster
1010
, defaultTLSClientParams
1111
, disableServerCertValidation
1212
, disableServerNameValidation
@@ -46,7 +46,7 @@ import Kubernetes.Client.Auth.GCP
4646
import Kubernetes.Client.Auth.OIDC
4747
import Kubernetes.Client.Auth.Token
4848
import Kubernetes.Client.Internal.TLSUtils
49-
import Kubernetes.Client.KubeConfig hiding (cluster)
49+
import Kubernetes.Client.KubeConfig
5050
import Network.Connection (TLSSettings (..))
5151
import qualified Network.HTTP.Client as NH
5252
import Network.HTTP.Client.TLS (mkManagerSettings)
@@ -80,10 +80,10 @@ kubeClient oidcCache (KubeConfigFile f) = do
8080
(tlsParams, cfg) <-
8181
case getAuthInfo kubeConfigFile of
8282
Left _ -> return (t,c)
83-
Right (_, auth)-> applyAuthSettings oidcCache auth (t, c)
83+
Right (_, auth) -> applyAuthSettings oidcCache auth (t, c)
8484
mgr <- newManager tlsParams
8585
return (mgr, cfg)
86-
kubeClient _ (KubeConfigCluster) = cluster
86+
kubeClient _ (KubeConfigCluster) = Kubernetes.Client.Config.cluster
8787

8888
-- |Creates 'NH.Manager' and 'K.KubernetesClientConfig' assuming it is being executed in a pod
8989
cluster :: (MonadIO m, MonadThrow m) => m (NH.Manager, K.KubernetesClientConfig)

0 commit comments

Comments
 (0)