correct proxy on/off (#1636)

Closes #1623 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: CI/CD pipeline <CI/[email protected]>
berops · Jan 28, 2025 · 73ce8f9 · 73ce8f9
1 parent 9c4d79f
commit 73ce8f9
Show file tree

Hide file tree

Showing 38 changed files with 1,006 additions and 1,011 deletions.
diff --git a/manifests/claudie/kustomization.yaml b/manifests/claudie/kustomization.yaml
@@ -57,18 +57,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: ghcr.io/berops/claudie/ansibler
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/autoscaler-adapter
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/builder
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/claudie-operator
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/kube-eleven
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/kuber
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/manager
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
 - name: ghcr.io/berops/claudie/terraformer
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
diff --git a/manifests/testing-framework/kustomization.yaml b/manifests/testing-framework/kustomization.yaml
@@ -91,4 +91,4 @@ secretGenerator:
 
 images:
 - name: ghcr.io/berops/claudie/testing-framework
-  newTag: ea00b9f-3217
+  newTag: ea531b3-3222
diff --git a/proto/ansibler.proto b/proto/ansibler.proto
@@ -18,7 +18,6 @@ message SetUpLBRequest {
   spec.K8scluster desired = 1;
   repeated spec.LBcluster currentLbs = 2;
   repeated spec.LBcluster desiredLbs = 3;
-  spec.ProxyEnvs proxyEnvs = 4;
   string projectName = 6;
 }
 
@@ -31,7 +30,6 @@ message DetermineApiEndpointChangeRequest {
   spec.K8scluster current = 1;
   repeated spec.LBcluster currentLbs = 2;
 
-  spec.ProxyEnvs proxyEnvs = 4;
   string projectName = 5;
 
   spec.ApiEndpointChangeState state = 6;
@@ -51,7 +49,6 @@ message UpdateAPIEndpointRequest{
   }
   spec.K8scluster current = 1;
   Endpoint endpoint = 2;
-  spec.ProxyEnvs proxyEnvs = 3;
   string projectName = 4;
 }
 
@@ -65,31 +62,24 @@ message UpdateProxyEnvsOnNodesRequest{
   string projectName = 3;
 }
 
-message UpdateProxyEnvsOnNodesResponse{
-  spec.K8scluster desired = 1;
-}
+message UpdateProxyEnvsOnNodesResponse{}
 
-message UpdateNoProxyEnvsInKubernetesRequest{
+message UpdateProxyEnvsK8sServicesRequest{
   spec.K8scluster current = 1;
   spec.K8scluster desired = 2;
   spec.ProxyEnvs proxyEnvs = 3;
   string projectName = 4;
 }
 
-message UpdateNoProxyEnvsInKubernetesResponse{
-  spec.K8scluster desired = 1;
-}
+message UpdateProxyEnvsK8sServicesResponse{}
 
 message RemoveClaudieUtilitiesRequest {
   spec.K8scluster current = 1;
   repeated spec.LBcluster currentLbs = 2;
   string projectName = 3;
 }
 
-message RemoveClaudieUtilitiesResponse {
-  spec.K8scluster current = 1;
-  repeated spec.LBcluster currentLbs = 2;
-}
+message RemoveClaudieUtilitiesResponse {}
 
 service AnsiblerService {
   // InstallNodeRequirements installs any requirements there are on all of the nodes.
@@ -106,8 +96,8 @@ service AnsiblerService {
   rpc UpdateAPIEndpoint(UpdateAPIEndpointRequest) returns (UpdateAPIEndpointResponse);
   // UpdateProxyEnvsOnNodes handles changes of HTTP_PROXY, HTTPS_PROXY, NO_PROXY, http_proxy, https_proxy and no_proxy envs in /etc/environment
   rpc UpdateProxyEnvsOnNodes(UpdateProxyEnvsOnNodesRequest) returns (UpdateProxyEnvsOnNodesResponse);
-  // UpdateNoProxyEnvsInKubernetes handles changes of NO_PROXY and no_proxy envs in kube-proxy and static pods
-  rpc UpdateNoProxyEnvsInKubernetes(UpdateNoProxyEnvsInKubernetesRequest) returns (UpdateNoProxyEnvsInKubernetesResponse);
+  // UpdateProxyEnvsK8sServices propagates the changes to the HTTP proxy to relevant kubernetes services.
+  rpc UpdateProxyEnvsK8sServices(UpdateProxyEnvsK8sServicesRequest) returns (UpdateProxyEnvsK8sServicesResponse);
   // Removes utilities installed by claudie via ansible playbooks.
   rpc RemoveClaudieUtilities(RemoveClaudieUtilitiesRequest) returns (RemoveClaudieUtilitiesResponse);
 }
diff --git a/proto/kubeEleven.proto b/proto/kubeEleven.proto
@@ -7,7 +7,6 @@ option go_package = "proto/pb";
 
 message BuildClusterRequest {
   spec.K8scluster desired = 1;
-  spec.ProxyEnvs proxyEnvs = 3;
   string projectName = 4;
   // Endpoint specifies if the endpoint
   // is on a loadbalancer. If empty the