Skip to content

Commit

Permalink
correct api endpoint change (#1366)
Browse files Browse the repository at this point in the history
* correct api endpoint change

* fix typo

* Auto commit - update kustomization.yaml

---------

Co-authored-by: CI/CD pipeline <CI/CD-pipeline@users.noreply.github.com>
  • Loading branch information
Despire and CI/CD pipeline committed May 3, 2024
1 parent d6d2ae4 commit 9ae30c0
Show file tree
Hide file tree
Showing 25 changed files with 657 additions and 370 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: proto contextbox scheduler builder terraformer ansibler kubeEleven test database minio containerimgs crd crd-apply controller-gen kind-load-images

# Enforce same version of protoc
PROTOC_VERSION = "25.1"
PROTOC_VERSION = "26.1"
CURRENT_VERSION = $$(protoc --version | awk '{print $$2}')
# Generate all .proto files
proto:
Expand Down
16 changes: 8 additions & 8 deletions manifests/claudie/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: ghcr.io/berops/claudie/ansibler
newTag: 1eac122-2739
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/autoscaler-adapter
newTag: 688726a-1932
- name: ghcr.io/berops/claudie/builder
newTag: 1eac122-2739
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/claudie-operator
newTag: 684a010-2740
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/context-box
newTag: 1eac122-2739
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/kube-eleven
newTag: 1eac122-2739
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/kuber
newTag: 1eac122-2739
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/scheduler
newTag: 1eac122-2739
newTag: 45e9b32-2753
- name: ghcr.io/berops/claudie/terraformer
newTag: 1eac122-2739
newTag: 45e9b32-2753
2 changes: 1 addition & 1 deletion manifests/testing-framework/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ secretGenerator:

images:
- name: ghcr.io/berops/claudie/testing-framework
newTag: 1eac122-2739
newTag: 45e9b32-2753
114 changes: 62 additions & 52 deletions proto/kuber.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ import "proto/config.proto";

option go_package = "proto/pb";

message SetUpStorageRequest {
K8scluster desiredCluster = 1;
}
message SetUpStorageResponse {
K8scluster desiredCluster = 1;
}
message SetUpStorageRequest { K8scluster desiredCluster = 1; }
message SetUpStorageResponse { K8scluster desiredCluster = 1; }

message StoreKubeconfigRequest {
K8scluster cluster = 1;
Expand All @@ -18,9 +14,7 @@ message StoreKubeconfigRequest {

message StoreKubeconfigResponse {}

message DeleteKubeconfigRequest {
K8scluster cluster = 1;
}
message DeleteKubeconfigRequest { K8scluster cluster = 1; }

message DeleteKubeconfigResponse {}

Expand All @@ -30,9 +24,7 @@ message DeleteNodesRequest {
repeated string masterNodes = 3;
}

message DeleteNodesResponse {
K8scluster cluster = 1;
}
message DeleteNodesResponse { K8scluster cluster = 1; }

message StoreClusterMetadataRequest {
K8scluster cluster = 1;
Expand All @@ -49,77 +41,95 @@ message StoreLBScrapeConfigRequest {

message StoreLBScrapeConfigResponse {}

message RemoveLBScrapeConfigRequest {
K8scluster cluster = 1;
}
message RemoveLBScrapeConfigRequest { K8scluster cluster = 1; }

message RemoveLBScrapeConfigResponse {}

message DeleteClusterMetadataRequest {
K8scluster cluster = 1;
}
message DeleteClusterMetadataRequest { K8scluster cluster = 1; }

message DeleteClusterMetadataResponse {}

message PatchNodesRequest {
K8scluster cluster = 1;
}
message PatchNodesRequest { K8scluster cluster = 1; }

message PatchNodesResponse {}

message SetUpClusterAutoscalerRequest{
message SetUpClusterAutoscalerRequest {
string projectName = 1;
K8scluster cluster = 2;
}

message SetUpClusterAutoscalerResponse {}

message DestroyClusterAutoscalerRequest{
message DestroyClusterAutoscalerRequest {
string projectName = 1;
K8scluster cluster = 2;
}

message DestroyClusterAutoscalerResponse {}

message PatchClusterInfoConfigMapRequest {
K8scluster desiredCluster = 1;
}
message PatchClusterInfoConfigMapRequest { K8scluster desiredCluster = 1; }

message PatchClusterInfoConfigMapResponse {}

message CiliumRolloutRestartRequest{
K8scluster cluster = 1;
}
message CiliumRolloutRestartRequest { K8scluster cluster = 1; }

message CiliumRolloutRestartResponse{}
message CiliumRolloutRestartResponse {}

message PatchKubeProxyConfigMapRequest { K8scluster desiredCluster = 1; }
message PatchKubeProxyConfigMapResponse {}

service KuberService {
// RemoveLBScrapeConfig removes scrape config for every LB detached from this cluster.
rpc RemoveLBScrapeConfig(RemoveLBScrapeConfigRequest) returns (RemoveLBScrapeConfigResponse);
// StoreLBScrapeConfig stores scrape config for every LB attached to this cluster.
rpc StoreLBScrapeConfig(StoreLBScrapeConfigRequest) returns (StoreLBScrapeConfigResponse);
// StoreClusterMetadata creates a secret, which holds the private key and a list of public IP addresses of the cluster supplied.
rpc StoreClusterMetadata(StoreClusterMetadataRequest) returns (StoreClusterMetadataResponse);
// DeleteClusterMetadata deletes the secret holding the private key and public IP addresses of the cluster supplied.
rpc DeleteClusterMetadata(DeleteClusterMetadataRequest) returns (DeleteClusterMetadataResponse);
// RemoveLBScrapeConfig removes scrape config for every LB detached from this
// cluster.
rpc RemoveLBScrapeConfig(RemoveLBScrapeConfigRequest)
returns (RemoveLBScrapeConfigResponse);
// StoreLBScrapeConfig stores scrape config for every LB attached to this
// cluster.
rpc StoreLBScrapeConfig(StoreLBScrapeConfigRequest)
returns (StoreLBScrapeConfigResponse);
// StoreClusterMetadata creates a secret, which holds the private key and a
// list of public IP addresses of the cluster supplied.
rpc StoreClusterMetadata(StoreClusterMetadataRequest)
returns (StoreClusterMetadataResponse);
// DeleteClusterMetadata deletes the secret holding the private key and public
// IP addresses of the cluster supplied.
rpc DeleteClusterMetadata(DeleteClusterMetadataRequest)
returns (DeleteClusterMetadataResponse);
// SetUpStorage installs Longhorn into the cluster.
rpc SetUpStorage(SetUpStorageRequest) returns (SetUpStorageResponse);
// StoreKubeconfig creates a secret, which holds the kubeconfig of a Claudie-created cluster.
// StoreKubeconfig creates a secret, which holds the kubeconfig of a
// Claudie-created cluster.
rpc StoreKubeconfig(StoreKubeconfigRequest) returns (StoreKubeconfigResponse);
// DeleteKubeconfig removes the secret that holds the kubeconfig of a Claudie-created cluster.
rpc DeleteKubeconfig(DeleteKubeconfigRequest) returns (DeleteKubeconfigResponse);
// DeleteKubeconfig removes the secret that holds the kubeconfig of a
// Claudie-created cluster.
rpc DeleteKubeconfig(DeleteKubeconfigRequest)
returns (DeleteKubeconfigResponse);
// DeleteNodes deletes the specified nodes from a k8s cluster.
rpc DeleteNodes(DeleteNodesRequest) returns (DeleteNodesResponse);
// PatchNodes applies attributes like providerID, labels or taints to the nodes.
// PatchNodes applies attributes like providerID, labels or taints to the
// nodes.
rpc PatchNodes(PatchNodesRequest) returns (PatchNodesResponse);
// SetUpClusterAutoscaler deploys Cluster Autoscaler and Autoscaler Adapter for every cluster specified.
rpc SetUpClusterAutoscaler(SetUpClusterAutoscalerRequest) returns (SetUpClusterAutoscalerResponse);
// DestroyClusterAutoscaler deletes Cluster Autoscaler and Autoscaler Adapter for every cluster specified.
rpc DestroyClusterAutoscaler(DestroyClusterAutoscalerRequest) returns (DestroyClusterAutoscalerResponse);
// PatchClusterInfoConfigMap updates the cluster-info config map in the kube-public namespace with the the
// kubeconfig. This needs to be done after an api endpoint change as the config map in the kube-public namespace
// is used by kubeadm when joining.
rpc PatchClusterInfoConfigMap(PatchClusterInfoConfigMapRequest) returns (PatchClusterInfoConfigMapResponse);
// SetUpClusterAutoscaler deploys Cluster Autoscaler and Autoscaler Adapter
// for every cluster specified.
rpc SetUpClusterAutoscaler(SetUpClusterAutoscalerRequest)
returns (SetUpClusterAutoscalerResponse);
// DestroyClusterAutoscaler deletes Cluster Autoscaler and Autoscaler Adapter
// for every cluster specified.
rpc DestroyClusterAutoscaler(DestroyClusterAutoscalerRequest)
returns (DestroyClusterAutoscalerResponse);
// PatchClusterInfoConfigMap updates the cluster-info config map in the
// kube-public namespace with the the kubeconfig. This needs to be done after
// an api endpoint change as the config map in the kube-public namespace is
// used by kubeadm when joining.
rpc PatchClusterInfoConfigMap(PatchClusterInfoConfigMapRequest)
returns (PatchClusterInfoConfigMapResponse);
// PatchCubeProxyConfigMap updates the kube-proxy config map with the value of
// the server: from the passed in kubeconfig and subsequently restarts all
// kube-proxy pods in the kube-system namespace. This change needs to be done
// after a endpoint change is performed.
rpc PatchKubeProxyConfigMap(PatchKubeProxyConfigMapRequest)
returns (PatchKubeProxyConfigMapResponse);
// CiliumRolloutRestart performs a rollout restart of the cilium daemonset.
rpc CiliumRolloutRestart(CiliumRolloutRestartRequest) returns (CiliumRolloutRestartResponse);
}
rpc CiliumRolloutRestart(CiliumRolloutRestartRequest)
returns (CiliumRolloutRestartResponse);
}
4 changes: 2 additions & 2 deletions proto/pb/ansibler.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 14 additions & 23 deletions proto/pb/ansibler_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions proto/pb/claudie-operator.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9ae30c0

Please sign in to comment.