templates file updated

Author: nxtcoder36

cmd/agent-operator/main.go

@@ -3,55 +3,41 @@ package main
 import (
 	"github.com/kloudlite/operator/toolkit/operator"
 
-	app "github.com/kloudlite/operator/operators/app-n-lambda/controller"
-	helmCharts "github.com/kloudlite/operator/operators/helm-charts/controller"
-	lifecycle "github.com/kloudlite/operator/operators/lifecycle/controller"
-
-	msvcAndMres "github.com/kloudlite/operator/operators/msvc-n-mres/controller"
-	networkingv1 "github.com/kloudlite/operator/operators/networking/register"
-	project "github.com/kloudlite/operator/operators/project/controller"
-	resourceWatcher "github.com/kloudlite/operator/operators/resource-watcher/controller"
-
-	routers "github.com/kloudlite/operator/operators/routers/controller"
-
-	serviceIntercept "github.com/kloudlite/operator/operators/service-intercept/controller"
 	workmachine "github.com/kloudlite/operator/operators/workmachine/register"
 	workspace "github.com/kloudlite/operator/operators/workspace/register"
-	pluginHelmChart "github.com/kloudlite/plugin-helm-chart/kloudlite"
-	pluginMongoDB "github.com/kloudlite/plugin-mongodb/kloudlite"
 )
 
 func main() {
 	mgr := operator.New("agent-operator")
 
 	// kloudlite resources
-	app.RegisterInto(mgr)
-	project.RegisterInto(mgr)
-	helmCharts.RegisterInto(mgr)
-	routers.RegisterInto(mgr)
+	// app.RegisterInto(mgr)
+	// project.RegisterInto(mgr)
+	// helmCharts.RegisterInto(mgr)
+	// routers.RegisterInto(mgr)
 
 	// kloudlite managed services
-	msvcAndMres.RegisterInto(mgr)
+	// msvcAndMres.RegisterInto(mgr)
 
 	// msvcMongo.RegisterInto(mgr)
 	// msvcRedis.RegisterInto(mgr)
 	// msvcMysql.RegisterInto(mgr)
 	// msvcPostgres.RegisterInto(mgr)
 
-	lifecycle.RegisterInto(mgr)
+	// lifecycle.RegisterInto(mgr)
 
 	// kloudlite resource status updates
-	resourceWatcher.RegisterInto(mgr)
+	// resourceWatcher.RegisterInto(mgr)
 
 	// distribution.RegisterInto(mgr)
 
-	networkingv1.RegisterInto(mgr)
-	serviceIntercept.RegisterInto(mgr)
+	// networkingv1.RegisterInto(mgr)
+	// serviceIntercept.RegisterInto(mgr)
 	workmachine.RegisterInto(mgr)
 	workspace.RegisterInto(mgr)
 
-	pluginMongoDB.RegisterInto(mgr)
-	pluginHelmChart.RegisterInto(mgr)
+	// pluginMongoDB.RegisterInto(mgr)
+	// pluginHelmChart.RegisterInto(mgr)
 
 	mgr.Start()
 }

operators/workspace/internal/templates/deployments/sts.yml.tpl

@@ -49,6 +49,7 @@ spec:
 
             if [ ! -d "/home/kl/.ssh" ]; then
               mkdir -p /home/kl/.ssh
+              chown -R 1000:1000 /home/kl/.ssh
             fi
             if [ -f "/home/kl/.ssh/authorized_keys" ]; then
               if ! cmp -s /tmp/authorized_keys /home/kl/.ssh/authorized_keys; then
@@ -64,14 +65,14 @@ spec:
             if [ -f "/home/kl/.ssh/id_rsa" ]; then
               if ! cmp -s /tmp/id_rsa /home/kl/.ssh/id_rsa; then
                 echo "id_rsa file differs, copying new one"
-                rm /home/kl/.ssh/id_rsa* || true
+                rm -f /home/kl/.ssh/id_rsa* 2>/dev/null || true
                 cp /tmp/id_rsa /home/kl/.ssh/id_rsa
                 cp /tmp/id_rsa.pub /home/kl/.ssh/id_rsa.pub
               fi
               echo "id_rsa file is up to date"
             else
               echo "id_rsa file not found, copying new one"
-              rm /home/kl/.ssh/id_rsa* || true
+              rm -f /home/kl/.ssh/id_rsa* 2>/dev/null || true
               cp /tmp/id_rsa /home/kl/.ssh/id_rsa
               cp /tmp/id_rsa.pub /home/kl/.ssh/id_rsa.pub
             fi
@@ -149,11 +150,11 @@ spec:
 
             - mountPath: /tmp/id_rsa.pub
               name: ssh-keys
-              subPath: id_rsa.pub
+              subPath: public_key
 
             - mountPath: /tmp/id_rsa
               name: ssh-keys
-              subPath: id_rsa
+              subPath: private_key
 
             - mountPath: /nix
               name: nix-dir
@@ -162,7 +163,7 @@ spec:
               name: containerenv
 
             - mountPath: /home/kl/.ssh/authorized_keys
-              name: sshkey
+              name: ssh-keys
               subPath: authorized_keys
 
       containers:
@@ -235,7 +236,7 @@ spec:
       {{ end }}
 
       volumes:
-      - name: sshkey
+      - name: ssh-keys
         secret:
           secretName: ssh-public-keys