Skip to content
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

correct proxy on/off #1636

Merged
merged 4 commits into from
Jan 28, 2025
Merged

correct proxy on/off #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9674af8
correct proxy on/off
Despire Jan 23, 2025
5f0ef76
Merged master into fix/proxy-restart.
github-actions[bot] Jan 23, 2025
c5187cc
fix linter
Despire Jan 23, 2025
410a153
Auto commit - update kustomization.yaml
Jan 23, 2025
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
16 changes: 8 additions & 8 deletions manifests/claudie/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion manifests/testing-framework/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ secretGenerator:

images:
- name: ghcr.io/berops/claudie/testing-framework
newTag: ea00b9f-3217
newTag: ea531b3-3222
22 changes: 6 additions & 16 deletions proto/ansibler.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
Expand All @@ -51,7 +49,6 @@ message UpdateAPIEndpointRequest{
}
spec.K8scluster current = 1;
Endpoint endpoint = 2;
spec.ProxyEnvs proxyEnvs = 3;
string projectName = 4;
}

Expand All @@ -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.
Expand All @@ -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);
}
1 change: 0 additions & 1 deletion proto/kubeEleven.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading