address comments

cmd/security-controller/main.go

@@ -17,9 +17,10 @@ limitations under the License.
 package main
 
 import (
-	// The following line to load the gcp plugin (only required to authenticate against GKE clusters).
 	"github.com/google/knative-gcp/pkg/reconciler/security/istio/eventpolicybinding"
 	"github.com/google/knative-gcp/pkg/reconciler/security/istio/httppolicybinding"
+
+	// The following line to load the gcp plugin (only required to authenticate against GKE clusters).
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 
 	"knative.dev/pkg/injection/sharedmain"

cmd/security-webhook/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Knative Authors
+Copyright 2020 Google LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -118,7 +118,7 @@ func main() {
 		ServiceName: logconfig.WebhookName(),
 		Port:        8443,
 		// SecretName must match the name of the Secret created in the configuration.
-		SecretName: "webhook-certs",
+		SecretName: "security-webhook-certs",
 	})
 
 	sharedmain.WebhookMainWithContext(ctx, logconfig.WebhookName(),

config/security/400-webhook-service.yaml

@@ -16,13 +16,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    role: webhook
+    role: security-webhook
     security.knative.dev/release: devel
-  name: webhook
+  name: security-webhook
   namespace: knative-security
 spec:
   ports:
     - port: 443
       targetPort: 8443
   selector:
-    role: webhook
+    role: security-webhook

config/security/500-webhook-config-validation.yaml

@@ -23,7 +23,7 @@ webhooks:
       - v1beta1
     clientConfig:
       service:
-        name: webhook
+        name: security-webhook
         namespace: knative-security
     failurePolicy: Fail
     sideEffects: None

config/security/500-webhook-defaulting.yaml

@@ -23,7 +23,7 @@ webhooks:
   - v1beta1
   clientConfig:
     service:
-      name: webhook
+      name: security-webhook
       namespace: knative-security
   failurePolicy: Fail
   sideEffects: None

config/security/500-webhook-resource-validation.yaml

@@ -23,7 +23,7 @@ webhooks:
       - v1beta1
     clientConfig:
       service:
-        name: webhook
+        name: security-webhook
         namespace: knative-security
     failurePolicy: Fail
     sideEffects: None

config/security/500-webhook-secret.yaml

@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: webhook-certs
+  name: security-webhook-certs
   namespace: knative-security
   labels:
     security.knative.dev/release: devel

config/security/500-webhook.yaml

@@ -15,7 +15,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: webhook
+  name: security-webhook
   namespace: knative-security
   labels:
     security.knative.dev/release: devel
@@ -24,12 +24,12 @@ spec:
   selector:
     matchLabels:
       app: knative-security
-      role: webhook
+      role: security-webhook
   template:
     metadata:
       labels:
         app: knative-security
-        role: webhook
+        role: security-webhook
         security.knative.dev/release: devel
     spec:
       serviceAccountName: security-webhook
@@ -58,4 +58,4 @@ spec:
             - name: METRICS_DOMAIN
               value: cloud.google.com/events
             - name: WEBHOOK_NAME
-              value: webhook
+              value: security-webhook