logging help

hashicorp · Aug 7, 2023 · 52acedd · 52acedd
1 parent 31773b6
commit 52acedd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/control-plane/api-gateway/gatekeeper/deployment.go b/control-plane/api-gateway/gatekeeper/deployment.go
@@ -28,7 +28,7 @@ func (g *Gatekeeper) upsertDeployment(ctx context.Context, gateway gwv1beta1.Gat
 	// Get Deployment if it exists.
 	existingDeployment := &appsv1.Deployment{}
 	exists := false
-
+	g.Log.Info("UpsertDeployment")
 	err := g.Client.Get(ctx, g.namespacedName(gateway), existingDeployment)
 	if err != nil && !k8serrors.IsNotFound(err) {
 		return err

diff --git a/control-plane/api-gateway/gatekeeper/role.go b/control-plane/api-gateway/gatekeeper/role.go
@@ -23,11 +23,14 @@ func (g *Gatekeeper) upsertRole(ctx context.Context, gateway gwv1beta1.Gateway,
 		return g.deleteRole(ctx, types.NamespacedName{Namespace: gateway.Namespace, Name: gateway.Name})
 	}
 
+	g.Log.Info("UpsertRole")
+
 	role := &rbac.Role{}
 
 	// If the Role already exists, ensure that we own the Role
 	err := g.Client.Get(ctx, g.namespacedName(gateway), role)
 	if err != nil && !k8serrors.IsNotFound(err) {
+		g.Log.Info("UpsertRole Failed")
 		return err
 	} else if !k8serrors.IsNotFound(err) {
 		// Ensure we own the Role.
@@ -80,6 +83,7 @@ func (g *Gatekeeper) role(gateway gwv1beta1.Gateway, gcc v1alpha1.GatewayClassCo
 			Verbs:         []string{"use"},
 		})
 	}
+	g.Log.Info("------------------------------------------Is Openshift Enabled?")
 
 	if config.EnableOpenShift {
 		g.Log.Info("------------------------------------------Openshift Enabled")
@@ -88,7 +92,8 @@ func (g *Gatekeeper) role(gateway gwv1beta1.Gateway, gcc v1alpha1.GatewayClassCo
 			Resources: []string{"securitycontextconstraints"},
 			// TODO(nathancoleman) Consider accepting an explicit SCC name. This will make the code
 			//   here less brittle and allow for the user to provide their own SCC if they wish.
-			ResourceNames: []string{config.ReleaseName + "-api-gateway", "gateway-*"},
+			//ResourceNames: []string{config.ReleaseName + "-api-gateway"},
+			ResourceNames: []string{"privileged"},
 			Verbs:         []string{"use"},
 		})
 	}

diff --git a/control-plane/api-gateway/gatekeeper/service.go b/control-plane/api-gateway/gatekeeper/service.go
@@ -31,6 +31,8 @@ func (g *Gatekeeper) upsertService(ctx context.Context, gateway gwv1beta1.Gatewa
 		return g.deleteService(ctx, types.NamespacedName{Namespace: gateway.Namespace, Name: gateway.Name})
 	}
 
+	g.Log.Info("UpsertService")
+
 	service := g.service(gateway, gcc)
 
 	mutated := service.DeepCopy()