Skip to content

fix: wrap host with brackets if IPv6 address detected #114

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

Open
johnnywalker wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

fix: wrap host with brackets if IPv6 address detected #114

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
9 changes: 8 additions & 1 deletion kubernetes-client/src/Kubernetes/Client/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,17 @@ mkInClusterClientConfig = do
defTlsParams
host <- liftIO $ getEnv "KUBERNETES_SERVICE_HOST"
port <- liftIO $ getEnv "KUBERNETES_SERVICE_PORT"
cfg <- setMasterURI (T.pack $ "https://" ++ host ++ ":" ++ port) <$> liftIO
cfg <- setMasterURI (T.pack $ "https://" ++ (formatHost host) ++ ":" ++ port) <$> liftIO
(K.newConfig >>= setTokenFileAuth (serviceAccountDir ++ "/token"))
return (mgr, cfg)

-- | Wraps host with brackets if IPv6 address detected and not already wrapped
formatHost :: String -> String
formatHost host@('[' : _) = host -- already wrapped with brackets
formatHost host
| ':' `elem` host = "[" ++ host ++ "]" -- assume IPv6 if host has colons
| otherwise = host

-- |Sets the master URI in the 'K.KubernetesClientConfig'.
setMasterURI
:: T.Text -- ^ Master URI
Expand Down