Skip to content

Commit 73ce8f9

Browse files
Despiregithub-actions[bot]CI/CD pipeline
authored
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]>
1 parent 9c4d79f commit 73ce8f9

38 files changed

+1006
-1011
lines changed

manifests/claudie/kustomization.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
5757
kind: Kustomization
5858
images:
5959
- name: ghcr.io/berops/claudie/ansibler
60-
newTag: ea00b9f-3217
60+
newTag: ea531b3-3222
6161
- name: ghcr.io/berops/claudie/autoscaler-adapter
62-
newTag: ea00b9f-3217
62+
newTag: ea531b3-3222
6363
- name: ghcr.io/berops/claudie/builder
64-
newTag: ea00b9f-3217
64+
newTag: ea531b3-3222
6565
- name: ghcr.io/berops/claudie/claudie-operator
66-
newTag: ea00b9f-3217
66+
newTag: ea531b3-3222
6767
- name: ghcr.io/berops/claudie/kube-eleven
68-
newTag: ea00b9f-3217
68+
newTag: ea531b3-3222
6969
- name: ghcr.io/berops/claudie/kuber
70-
newTag: ea00b9f-3217
70+
newTag: ea531b3-3222
7171
- name: ghcr.io/berops/claudie/manager
72-
newTag: ea00b9f-3217
72+
newTag: ea531b3-3222
7373
- name: ghcr.io/berops/claudie/terraformer
74-
newTag: ea00b9f-3217
74+
newTag: ea531b3-3222

manifests/testing-framework/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ secretGenerator:
9191

9292
images:
9393
- name: ghcr.io/berops/claudie/testing-framework
94-
newTag: ea00b9f-3217
94+
newTag: ea531b3-3222

proto/ansibler.proto

+6-16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ message SetUpLBRequest {
1818
spec.K8scluster desired = 1;
1919
repeated spec.LBcluster currentLbs = 2;
2020
repeated spec.LBcluster desiredLbs = 3;
21-
spec.ProxyEnvs proxyEnvs = 4;
2221
string projectName = 6;
2322
}
2423

@@ -31,7 +30,6 @@ message DetermineApiEndpointChangeRequest {
3130
spec.K8scluster current = 1;
3231
repeated spec.LBcluster currentLbs = 2;
3332

34-
spec.ProxyEnvs proxyEnvs = 4;
3533
string projectName = 5;
3634

3735
spec.ApiEndpointChangeState state = 6;
@@ -51,7 +49,6 @@ message UpdateAPIEndpointRequest{
5149
}
5250
spec.K8scluster current = 1;
5351
Endpoint endpoint = 2;
54-
spec.ProxyEnvs proxyEnvs = 3;
5552
string projectName = 4;
5653
}
5754

@@ -65,31 +62,24 @@ message UpdateProxyEnvsOnNodesRequest{
6562
string projectName = 3;
6663
}
6764

68-
message UpdateProxyEnvsOnNodesResponse{
69-
spec.K8scluster desired = 1;
70-
}
65+
message UpdateProxyEnvsOnNodesResponse{}
7166

72-
message UpdateNoProxyEnvsInKubernetesRequest{
67+
message UpdateProxyEnvsK8sServicesRequest{
7368
spec.K8scluster current = 1;
7469
spec.K8scluster desired = 2;
7570
spec.ProxyEnvs proxyEnvs = 3;
7671
string projectName = 4;
7772
}
7873

79-
message UpdateNoProxyEnvsInKubernetesResponse{
80-
spec.K8scluster desired = 1;
81-
}
74+
message UpdateProxyEnvsK8sServicesResponse{}
8275

8376
message RemoveClaudieUtilitiesRequest {
8477
spec.K8scluster current = 1;
8578
repeated spec.LBcluster currentLbs = 2;
8679
string projectName = 3;
8780
}
8881

89-
message RemoveClaudieUtilitiesResponse {
90-
spec.K8scluster current = 1;
91-
repeated spec.LBcluster currentLbs = 2;
92-
}
82+
message RemoveClaudieUtilitiesResponse {}
9383

9484
service AnsiblerService {
9585
// InstallNodeRequirements installs any requirements there are on all of the nodes.
@@ -106,8 +96,8 @@ service AnsiblerService {
10696
rpc UpdateAPIEndpoint(UpdateAPIEndpointRequest) returns (UpdateAPIEndpointResponse);
10797
// UpdateProxyEnvsOnNodes handles changes of HTTP_PROXY, HTTPS_PROXY, NO_PROXY, http_proxy, https_proxy and no_proxy envs in /etc/environment
10898
rpc UpdateProxyEnvsOnNodes(UpdateProxyEnvsOnNodesRequest) returns (UpdateProxyEnvsOnNodesResponse);
109-
// UpdateNoProxyEnvsInKubernetes handles changes of NO_PROXY and no_proxy envs in kube-proxy and static pods
110-
rpc UpdateNoProxyEnvsInKubernetes(UpdateNoProxyEnvsInKubernetesRequest) returns (UpdateNoProxyEnvsInKubernetesResponse);
99+
// UpdateProxyEnvsK8sServices propagates the changes to the HTTP proxy to relevant kubernetes services.
100+
rpc UpdateProxyEnvsK8sServices(UpdateProxyEnvsK8sServicesRequest) returns (UpdateProxyEnvsK8sServicesResponse);
111101
// Removes utilities installed by claudie via ansible playbooks.
112102
rpc RemoveClaudieUtilities(RemoveClaudieUtilitiesRequest) returns (RemoveClaudieUtilitiesResponse);
113103
}

proto/kubeEleven.proto

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ option go_package = "proto/pb";
77

88
message BuildClusterRequest {
99
spec.K8scluster desired = 1;
10-
spec.ProxyEnvs proxyEnvs = 3;
1110
string projectName = 4;
1211
// Endpoint specifies if the endpoint
1312
// is on a loadbalancer. If empty the

0 commit comments

Comments
 (0)