Skip to content

REP-1940: Add a flag for gRPC address for cluster-proxy communication #661

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

Open
krystiancastai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

REP-1940: Add a flag for gRPC address for cluster-proxy communication #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions cmd/controller/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,10 @@ func setupClusterProxy(log *logging.Logger, cfg config.Config, clientset kuberne
Timeout: 30 * time.Second,
}

grpcConn, err := castai.NewGRPCConn(cfg.CastaiEnv, grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 10 * time.Second,
proxyCastaiEnv := cfg.CastaiEnv
proxyCastaiEnv.APIGrpcAddr = cfg.ClusterProxy.GRPCAddr
grpcConn, err := castai.NewGRPCConn(proxyCastaiEnv, grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 60 * time.Second,
Timeout: 5 * time.Second,
PermitWithoutStream: true,
}))
Expand Down
1 change: 1 addition & 0 deletions cmd/controller/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ type ClusterProxyConfig struct {
SAName string `json:"saName"`
SANamespace string `json:"saNamespace"`
TokenExpirationSeconds int64 `json:"tokenExpirationSeconds"`
GRPCAddr string `json:"grpcAddr"`
}

type AgentConfig struct {
Expand Down
2 changes: 2 additions & 0 deletions cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ var (
clusterProxyEnabled = pflag.Bool("cluster-proxy-enabled", false, "Enable cluster proxy for remote K8s API access")
clusterProxySAName = pflag.String("cluster-proxy-sa-name", "", "Name of the service account for cluster proxy")
clusterProxyTokenExpiry = pflag.Int64("cluster-proxy-token-expiration", 900, "Token expiration in seconds for the proxy SA")
clusterProxyGRPCAddr = pflag.String("cluster-proxy-grpc-addr", "", "gRPC address for cluster-proxy communication")
)

func main() {
Expand Down Expand Up @@ -218,6 +219,7 @@ func main() {
SAName: *clusterProxySAName,
SANamespace: podNs,
TokenExpirationSeconds: *clusterProxyTokenExpiry,
GRPCAddr: *clusterProxyGRPCAddr,
},
CloudProviderConfig: config.CloudProviderConfig{
CloudProvider: cloudtypes.ProviderConfig{
Expand Down
Loading