Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .tools/nvim/__http__/console/apps.graphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ variables:
name: "{{.name}}"
spec:
services:
- type: tcp
port: 80
targetPort: 80
- port: 80
containers:
- name: main
# image: kong/httpbin
Expand Down
2 changes: 1 addition & 1 deletion .tools/nvim/__http__/infra/global-vpn-devices.graphql.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
global:
gvpn: "default"
deviceName: "first-device"
deviceName: "kloudlite-platform-device"
# deviceName: "second-device"
---
label: "Create GlobalVPN Device"
Expand Down
88 changes: 84 additions & 4 deletions apps/infra/internal/app/graph/generated/generated.go

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

3 changes: 2 additions & 1 deletion apps/infra/internal/app/graph/model/models_gen.go

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

1 change: 1 addition & 0 deletions apps/infra/internal/app/graph/schema.graphqls
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ input SearchGlobalVPNs {

input SearchGlobalVPNDevices {
text: MatchFilterIn
creationMethod: MatchFilterIn
}

input SearchClusterManagedService {
Expand Down
12 changes: 9 additions & 3 deletions apps/infra/internal/app/graph/schema.resolvers.go

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

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
type GlobalVPNDevice @shareable {
accountName: String!
createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
creationMethod: String
creationTime: Date!
displayName: String!
globalVPNName: String!
Expand Down Expand Up @@ -28,6 +29,7 @@ type GlobalVPNDevicePaginatedRecords @shareable {
}

input GlobalVPNDeviceIn {
creationMethod: String
displayName: String!
globalVPNName: String!
metadata: MetadataIn!
Expand Down
72 changes: 70 additions & 2 deletions apps/infra/internal/domain/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ func (d *domain) GetClusterAdminKubeconfig(ctx InfraContext, clusterName string)
func (d *domain) applyCluster(ctx InfraContext, cluster *entities.Cluster) error {
addTrackingId(&cluster.Cluster, cluster.Id)
return d.applyK8sResource(ctx, &cluster.Cluster, cluster.RecordVersion)

// TODO: create cluster connection and apply to target cluster
}

func (d *domain) CreateCluster(ctx InfraContext, cluster entities.Cluster) (*entities.Cluster, error) {
Expand Down Expand Up @@ -374,6 +372,56 @@ func (d *domain) CreateCluster(ctx InfraContext, cluster entities.Cluster) (*ent
return nCluster, nil
}

/*
TODO:
- create a specific device for each global VPN reserved for kloudlite
- need to use that device as a kube-proxy to all the clusters
- we can read their logs, and everything on demand
*/

func (d *domain) syncKloudliteDeviceOnCluster(ctx InfraContext, gvpnName string) error {
// 1. parse deployment template
b, err := templates.Read(templates.GlobalVPNKloudliteDeviceTemplate)
if err != nil {
return errors.NewE(err)
}
accNs, err := d.getAccNamespace(ctx)
if err != nil {
return errors.NewE(err)
}

gv, err := d.findGlobalVPN(ctx, gvpnName)
if err != nil {
return err
}

if gv.KloudliteDevice.Name == "" {
return nil
}

// 2. Grab wireguard config from that device
wgConfig, err := d.getGlobalVPNDeviceWgConfig(ctx, gv.Name, gv.KloudliteDevice.Name)
if err != nil {
return err
}

deploymentBytes, err := templates.ParseBytes(b, templates.GVPNKloudliteDeviceTemplateVars{
Name: fmt.Sprintf("kloudlite-device-proxy-%s", gv.Name),
Namespace: accNs,
WgConfig: wgConfig,
KubeReverseProxyImage: d.env.GlobalVPNKubeReverseProxyImage,
})
if err != nil {
return err
}

if err := d.k8sClient.ApplyYAML(ctx, deploymentBytes); err != nil {
return errors.NewE(err)
}

return nil
}

func (d *domain) applyHelmKloudliteAgent(ctx InfraContext, clusterToken string, cluster *entities.Cluster) error {
b, err := templates.Read(templates.HelmKloudliteAgent)
if err != nil {
Expand Down Expand Up @@ -522,6 +570,26 @@ func (d *domain) GetCluster(ctx InfraContext, name string) (*entities.Cluster, e

c, err := d.findCluster(ctx, name)
if err != nil {
if errors.Is(err, ErrClusterNotFound) {
byokCluster, err := d.findBYOKCluster(ctx, name)
if err != nil {
return nil, err
}
return &entities.Cluster{
Cluster: clustersv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: byokCluster.Name,
},
Spec: clustersv1.ClusterSpec{
ClusterServiceCIDR: byokCluster.ClusterSvcCIDR,
PublicDNSHost: "",
},
},
ResourceMetadata: byokCluster.ResourceMetadata,
AccountName: byokCluster.AccountName,
GlobalVPN: &byokCluster.GlobalVPN,
}, nil
}
return nil, errors.NewE(err)
}

Expand Down
Loading