add crd to helm and cli test

solo-io · Mar 27, 2019 · 141f229 · 141f229
1 parent 3a7d378
commit 141f229
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/install/helm/gloo/templates/100-gloo-crds.yaml b/install/helm/gloo/templates/100-gloo-crds.yaml
@@ -90,4 +90,22 @@ spec:
   scope: Namespaced
   version: v1
 ---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: upstreamgroups.gloo.solo.io
+  annotations:
+    "helm.sh/hook": crd-install
+spec:
+  group: gloo.solo.io
+  names:
+    kind: UpstreamGroup
+    listKind: UpstreamGroupList
+    plural: upstreamgroups
+    shortNames:
+      - ug
+    singular: upstreamgroup
+  scope: Namespaced
+  version: v1
+---
 {{- end}}
diff --git a/install/helm/gloo/templates/20-namespace-clusterrole-gateway.yaml b/install/helm/gloo/templates/20-namespace-clusterrole-gateway.yaml
@@ -19,7 +19,7 @@ rules:
   resources: ["customresourcedefinitions"]
   verbs: ["get", "create"]
 - apiGroups: ["gloo.solo.io"]
-  resources: ["settings", "upstreams", "proxies","virtualservices"]
+  resources: ["settings", "upstreams","upstreamgroups", "proxies","virtualservices"]
   verbs: ["*"]
 - apiGroups: ["gateway.solo.io"]
   resources: ["virtualservices", "gateways"]

diff --git a/projects/gloo/cli/pkg/cmd/install/uninstall_test.go b/projects/gloo/cli/pkg/cmd/install/uninstall_test.go
@@ -37,7 +37,7 @@ func (k *MockKubectl) Kubectl(stdin io.Reader, args ...string) error {
 var _ = Describe("Uninstall", func() {
 
 	const (
-		deleteCrds = "delete crd gateways.gateway.solo.io proxies.gloo.solo.io settings.gloo.solo.io upstreams.gloo.solo.io virtualservices.gateway.solo.io"
+		deleteCrds = "delete crd gateways.gateway.solo.io proxies.gloo.solo.io settings.gloo.solo.io upstreams.gloo.solo.io upstreamgroups.gloo.solo.io virtualservices.gateway.solo.io"
 	)
 
 	var flagSet *pflag.FlagSet

diff --git a/projects/gloo/cli/pkg/cmd/install/util.go b/projects/gloo/cli/pkg/cmd/install/util.go
@@ -49,6 +49,7 @@ func init() {
 		"proxies.gloo.solo.io",
 		"settings.gloo.solo.io",
 		"upstreams.gloo.solo.io",
+		"upstreamgroups.gloo.solo.io",
 		"virtualservices.gateway.solo.io",
 	}