From f264e268f7f6e798319a24fc2adc1a19738f83c0 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 19 Sep 2021 14:26:42 -0300 Subject: [PATCH 1/3] Android adaptations --- kubernetes/config/incluster_config.c | 4 ++-- kubernetes/config/kube_config.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/config/incluster_config.c b/kubernetes/config/incluster_config.c index cd28980..1eec883 100644 --- a/kubernetes/config/incluster_config.c +++ b/kubernetes/config/incluster_config.c @@ -45,7 +45,7 @@ static int setBasePathInCluster(char **pBasePath) { static char fname[] = "setBasePathInCluster()"; -#ifndef _WIN32 +#ifdef __linux const char *service_host_env = secure_getenv(SERVICE_HOST_ENV_NAME); #else const char *service_host_env = getenv(SERVICE_HOST_ENV_NAME); @@ -54,7 +54,7 @@ static int setBasePathInCluster(char **pBasePath) fprintf(stderr, "%s: Cannot retrieve the kubernetes service host inside a pod by the env %s.\n", fname, SERVICE_HOST_ENV_NAME); return -1; } -#ifndef _WIN32 +#ifdef __linux const char *service_port_env = secure_getenv(SERVICE_PORT_ENV_NAME); #else const char *service_port_env = getenv(SERVICE_PORT_ENV_NAME); diff --git a/kubernetes/config/kube_config.c b/kubernetes/config/kube_config.c index 9c9c4c3..6bb46d4 100644 --- a/kubernetes/config/kube_config.c +++ b/kubernetes/config/kube_config.c @@ -110,7 +110,7 @@ static char *getWorkingConfigFile(const char *configFileNamePassedIn) if (configFileNamePassedIn) { configFileName = strdup(configFileNamePassedIn); } else { -#ifndef _WIN32 +#ifdef __linux kubeconfig_env = secure_getenv(ENV_KUBECONFIG); #else kubeconfig_env = getenv(ENV_KUBECONFIG); @@ -118,7 +118,7 @@ static char *getWorkingConfigFile(const char *configFileNamePassedIn) if (kubeconfig_env) { configFileName = strdup(kubeconfig_env); } else { -#ifndef _WIN32 +#ifdef __linux homedir_env = secure_getenv(ENV_HOME); #else homedir_env = getenv(ENV_HOME); From b05e7724b4f4a547fe2c1b1d29baa55687d43f39 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Sun, 19 Sep 2021 14:31:26 -0300 Subject: [PATCH 2/3] MacOS adaptations --- kubernetes/config/kube_config.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kubernetes/config/kube_config.c b/kubernetes/config/kube_config.c index 6bb46d4..1aa721f 100644 --- a/kubernetes/config/kube_config.c +++ b/kubernetes/config/kube_config.c @@ -110,18 +110,20 @@ static char *getWorkingConfigFile(const char *configFileNamePassedIn) if (configFileNamePassedIn) { configFileName = strdup(configFileNamePassedIn); } else { -#ifdef __linux - kubeconfig_env = secure_getenv(ENV_KUBECONFIG); -#else + +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) kubeconfig_env = getenv(ENV_KUBECONFIG); +#elif __linux + kubeconfig_env = secure_getenv(ENV_KUBECONFIG); #endif if (kubeconfig_env) { configFileName = strdup(kubeconfig_env); } else { -#ifdef __linux +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) + homedir_env = getenv(ENV_HOME); +#elif __linux homedir_env = secure_getenv(ENV_HOME); #else - homedir_env = getenv(ENV_HOME); #endif if (homedir_env) { int configFileNameSize = strlen(homedir_env) + strlen(KUBE_CONFIG_DEFAULT_LOCATION) + 1; From 64dcf16b20da98468cd1ba2269873cb989c7a90f Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 20 Sep 2021 10:27:35 -0300 Subject: [PATCH 3/3] MacOS adaptations --- kubernetes/config/incluster_config.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kubernetes/config/incluster_config.c b/kubernetes/config/incluster_config.c index 1eec883..f28ca89 100644 --- a/kubernetes/config/incluster_config.c +++ b/kubernetes/config/incluster_config.c @@ -45,19 +45,19 @@ static int setBasePathInCluster(char **pBasePath) { static char fname[] = "setBasePathInCluster()"; -#ifdef __linux - const char *service_host_env = secure_getenv(SERVICE_HOST_ENV_NAME); -#else +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) const char *service_host_env = getenv(SERVICE_HOST_ENV_NAME); +#elif __linux + const char *service_host_env = secure_getenv(SERVICE_HOST_ENV_NAME); #endif if (!service_host_env) { fprintf(stderr, "%s: Cannot retrieve the kubernetes service host inside a pod by the env %s.\n", fname, SERVICE_HOST_ENV_NAME); return -1; } -#ifdef __linux - const char *service_port_env = secure_getenv(SERVICE_PORT_ENV_NAME); -#else +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) const char *service_port_env = getenv(SERVICE_PORT_ENV_NAME); +#elif __linux + const char *service_port_env = secure_getenv(SERVICE_PORT_ENV_NAME); #endif if (!service_port_env) { fprintf(stderr, "%s: Cannot retrieve the kubernetes service port inside a pod by the env %s.\n", fname, SERVICE_PORT_ENV_NAME);