diff --git a/.github/workflows/integration-tests-kube-api.yml b/.github/workflows/integration-tests-kube-api.yml index 95fb36aa..1441c0cd 100644 --- a/.github/workflows/integration-tests-kube-api.yml +++ b/.github/workflows/integration-tests-kube-api.yml @@ -45,8 +45,8 @@ jobs: - name: Setup Minikube uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0 with: - minikube version: 'v1.27.1' # based on k8s v1.25.2 - kubernetes version: 'v1.25.2' + minikube version: 'v1.36.0' # based on k8s v1.33.1 + kubernetes version: 'v1.33.1' driver: docker github token: ${{ secrets.GITHUB_TOKEN }} start args: '--addons=ingress' diff --git a/.github/workflows/integration-tests-kube-dns.yml b/.github/workflows/integration-tests-kube-dns.yml index 15e67c45..47b1d476 100644 --- a/.github/workflows/integration-tests-kube-dns.yml +++ b/.github/workflows/integration-tests-kube-dns.yml @@ -44,8 +44,8 @@ jobs: - name: Setup Minikube uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0 with: - minikube version: 'v1.27.1' # based on k8s v1.25.2 - kubernetes version: 'v1.25.2' + minikube version: 'v1.36.0' # based on k8s v1.33.1 + kubernetes version: 'v1.33.1' driver: docker github token: ${{ secrets.GITHUB_TOKEN }} start args: '--addons=ingress' diff --git a/.github/workflows/integration-tests-lease.yml b/.github/workflows/integration-tests-lease.yml index 3d3fa241..fa25a366 100644 --- a/.github/workflows/integration-tests-lease.yml +++ b/.github/workflows/integration-tests-lease.yml @@ -44,8 +44,8 @@ jobs: - name: Setup Minikube uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0 with: - minikube version: 'v1.27.1' # based on k8s v1.25.2 - kubernetes version: 'v1.25.2' + minikube version: 'v1.36.0' # based on k8s v1.33.1 + kubernetes version: 'v1.33.1' driver: docker github token: ${{ secrets.GITHUB_TOKEN }} start args: '--addons=ingress' diff --git a/.github/workflows/integration-tests-maven.yml b/.github/workflows/integration-tests-maven.yml index 910d02cf..50b702ce 100644 --- a/.github/workflows/integration-tests-maven.yml +++ b/.github/workflows/integration-tests-maven.yml @@ -43,8 +43,8 @@ jobs: - name: Setup Minikube uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0 with: - minikube version: 'v1.27.1' # based on k8s v1.25.2 - kubernetes version: 'v1.25.2' + minikube version: 'v1.36.0' # based on k8s v1.33.1 + kubernetes version: 'v1.33.1' driver: docker github token: ${{ secrets.GITHUB_TOKEN }} start args: '--addons=ingress' diff --git a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala index 0bace9b5..3fa88683 100644 --- a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala +++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala @@ -111,7 +111,7 @@ class KubernetesApiServiceDiscovery(settings: Settings)( private val sslContext = { val certificates = PemManagersProvider.loadCertificates(settings.apiCaPath) - + log.info("Loaded {} certificates from {}", certificates.size, settings.apiCaPath) val factory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm) val keyStore = KeyStore.getInstance("PKCS12") keyStore.load(null) @@ -143,7 +143,16 @@ class KubernetesApiServiceDiscovery(settings: Settings)( podRequest(apiToken, podNamespace, labelSelector), s"Unable to form request; check Kubernetes environment (expecting env vars ${settings.apiServiceHostEnvName}, ${settings.apiServicePortEnvName})") - response <- http.singleRequest(request, clientSslContext).map(decodeResponse) + response <- { + val f = http.singleRequest(request, clientSslContext) + f.onComplete { + case scala.util.Failure(exception) => + log.error(exception, "Lookup failed to communicate with Kubernetes API server.") + case scala.util.Success(_) => + log.info("Lookup successfully communicated with Kubernetes API server.") + } + f.map(decodeResponse) + } entity <- response.entity.toStrict(resolveTimeout)