@@ -2,7 +2,6 @@ package helpers
22
33import (
44 "bufio"
5- "bytes"
65 "context"
76 "fmt"
87 "os"
@@ -74,77 +73,46 @@ func SetupNetworkIntercepts(ctx context.Context, clients testutils.K8sClients) (
7473 return nil , fmt .Errorf ("telepresence intercept deployment not ready: %w" , err )
7574 }
7675
77- envFile , err := os .CreateTemp ("" , "telepresence-env-*.sh" )
76+ fmt .Println ("INFO: connecting to the cluster with telepresence!!!" )
77+ // NOTE: We need to specify --manager-namespace to connect to the traffic-manager
78+ // installed in kong-system namespace above.
79+ connectArgs := []string {"connect" , "--manager-namespace" , "kong-system" , "--namespace" , "kong-system" }
80+ out , err := exec .CommandContext (ctx , telepresenceExec , connectArgs ... ).CombinedOutput ()
7881 if err != nil {
79- return nil , fmt .Errorf ("failed creating temporary env file for telepresence: %w" , err )
82+ return nil , fmt .Errorf ("failed to connect to the cluster with telepresence: %w, %s " , err , string ( out ) )
8083 }
81- envFilePath := envFile .Name ()
82- _ = envFile .Close ()
84+
85+ // envFile, err := os.CreateTemp("", "telepresence-env-*.sh")
86+ // if err != nil {
87+ // return nil, fmt.Errorf("failed creating temporary env file for telepresence: %w", err)
88+ // }
89+ // envFilePath := envFile.Name()
90+ // _ = envFile.Close()
8391
8492 fmt .Println ("INFO: establishing telepresence intercept for controller identity" )
85- var (
86- labelOverridePath string
87- )
93+ // var (
94+ // labelOverridePath string
95+ // )
8896 intercept := func (portPair int , svcName string ) []string {
8997 return []string {
9098 "replace" ,
9199 svcName ,
92100 "--port" , fmt .Sprintf ("%d:%d" , portPair , portPair ),
93- "--env-file" , envFilePath ,
94101 }
95102 }
96103
97104 cmd := exec .CommandContext (ctx , telepresenceExec , intercept (telepresenceInterceptPort , telepresenceInterceptName )... )
98105 cmd .Env = os .Environ ()
99106 output , err := cmd .CombinedOutput ()
100107 if err != nil {
101- if ! bytes .Contains (output , []byte ("already exists" )) {
102- _ = os .Remove (envFilePath )
103- return nil , fmt .Errorf ("failed to create telepresence intercept: %w, %s" , err , string (output ))
104- }
108+ // if !bytes.Contains(output, []byte("already exists")) {
109+ // _ = os.Remove(envFilePath)
110+ // return nil, fmt.Errorf("failed to create telepresence intercept: %w, %s", err, string(output))
111+ // }
105112 fmt .Println ("WARN: telepresence intercept already exists, reusing the existing session" )
106113 }
107114 fmt .Println (">>>\n " , string (output ), "\n <<<" )
108115
109- // const svc = "gateway-operator-webhook-service"
110- // cmd = exec.CommandContext(ctx, telepresenceExec, intercept(433, svc)...)
111- // cmd.Env = os.Environ()
112- // output, err = cmd.CombinedOutput()
113- // if err != nil {
114- // if !bytes.Contains(output, []byte("already exists")) {
115- // _ = os.Remove(envFilePath)
116- // return nil, fmt.Errorf("failed to create telepresence intercept: %w, %s", err, string(output))
117- // }
118- // fmt.Println("WARN: telepresence intercept already exists, reusing the existing session")
119- // }
120-
121- // cmd = exec.CommandContext(ctx, telepresenceExec, intercept(5433, svc)...)
122- // cmd.Env = os.Environ()
123- // output, err = cmd.CombinedOutput()
124- // if err != nil {
125- // if !bytes.Contains(output, []byte("already exists")) {
126- // _ = os.Remove(envFilePath)
127- // return nil, fmt.Errorf("failed to create telepresence intercept: %w, %s", err, string(output))
128- // }
129- // fmt.Println("WARN: telepresence intercept already exists, reusing the existing session")
130- // }
131-
132- if err := applyTelepresenceEnvFile (envFilePath ); err != nil {
133- leaveCmd := exec .CommandContext (ctx , telepresenceExec , "leave" , telepresenceInterceptName )
134- _ = leaveCmd .Run ()
135- _ = os .Remove (envFilePath )
136- return nil , fmt .Errorf ("failed to apply telepresence environment: %w" , err )
137- }
138-
139- overridePath , err := writePodLabelsOverride (interceptPodLabels ())
140- if err != nil {
141- return nil , fmt .Errorf ("failed to prepare pod labels override: %w" , err )
142- }
143- labelOverridePath = overridePath
144- if err := os .Setenv ("KONG_OPERATOR_POD_LABELS_FILE" , overridePath ); err != nil {
145- return nil , fmt .Errorf ("failed to set pod labels override env: %w" , err )
146- }
147-
148116 if err := ensureAdmissionRegistration (ctx , clients .K8sClient , k8stypes.NamespacedName {
149117 Namespace : controllerNamespace ,
150118 Name : "gateway-operator-webhook-service" ,
@@ -166,14 +134,14 @@ func SetupNetworkIntercepts(ctx context.Context, clients testutils.K8sClients) (
166134 fmt .Printf ("WARN: failed to delete intercept service %s/%s: %v\n " , controllerNamespace , telepresenceInterceptDeploymentName , err )
167135 }
168136
169- if err := os .Remove (envFilePath ); err != nil && ! os .IsNotExist (err ) {
170- fmt .Printf ("WARN: failed to remove telepresence env file %q: %v\n " , envFilePath , err )
171- }
172- if labelOverridePath != "" {
173- if err := os .Remove (labelOverridePath ); err != nil && ! os .IsNotExist (err ) {
174- fmt .Printf ("WARN: failed to remove pod labels override file %q: %v\n " , labelOverridePath , err )
175- }
176- }
137+ // if err := os.Remove(envFilePath); err != nil && !os.IsNotExist(err) {
138+ // fmt.Printf("WARN: failed to remove telepresence env file %q: %v\n", envFilePath, err)
139+ // }
140+ // if labelOverridePath != "" {
141+ // if err := os.Remove(labelOverridePath); err != nil && !os.IsNotExist(err) {
142+ // fmt.Printf("WARN: failed to remove pod labels override file %q: %v\n", labelOverridePath, err)
143+ // }
144+ // }
177145 }
178146
179147 return cleanup , nil
@@ -205,10 +173,11 @@ func ensureInterceptDeployment(ctx context.Context, clients testutils.K8sClients
205173 ObjectMeta : metav1.ObjectMeta {
206174 Labels : labels ,
207175 Annotations : map [string ]string {
208- "telepresence.getambassador. io/inject-traffic-agent" : "enabled" ,
176+ "telepresence.io/inject-traffic-agent" : "enabled" ,
209177 },
210178 },
211179 Spec : corev1.PodSpec {
180+ PriorityClassName : "system-cluster-critical" ,
212181 Containers : []corev1.Container {
213182 {
214183 Name : "identity" ,
0 commit comments