Registry Addon Fixup

roles/kubernetes-apps/registry/templates/registry-svc.yml.j2

@@ -2,17 +2,17 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kube-registry
-  namespace: {{ system_namespace }}
+  name: registry
+  namespace: {{ registry_namespace }}
   labels:
-    k8s-app: kube-registry-upstream
+    k8s-app: registry
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeRegistry"
 spec:
   selector:
-    k8s-app: kube-registry-upstream
+    k8s-app: registry
   ports:
-  - name: registry
-    port: 5000
-    protocol: TCP
+    - name: registry
+      port: 5000
+      protocol: TCP