Merge pull request #17 from keithmattix/new-helm-chart

Update helm chart
servicemeshinterface · Oct 27, 2021 · 96b30f8 · 96b30f8
2 parents 6a60572 + 08618a0
commit 96b30f8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 DOCKER_REPO=nicholasjackson/smi-controller-example
 DOCKER_VERSION=0.1.0
 SHELL := /bin/bash
+UNAME := $(shell uname)
 
 build_docker_setup:
 	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
@@ -28,8 +29,10 @@ generate_helm: manifests
 # First generate the Helm specific kustomize config that creates the RBAC and CRDs
 	kustomize build ./config/helm -o ./helm/smi-controller/templates
 
+# Pick the correct sed -i argument based on OS (Darwin uses BSD sed, not GNU sed)
 # Replace port with helm syntax, kustomize rejects Helm syntax not in quotes and this field is an integer
-	sed -i 's/port: 443/port: {{ .Values.webhook.port }}/' ./helm/smi-controller/templates/apiextensions.k8s.io_v1_customresourcedefinition_*.yaml
+	sedi=(-i) && [ "$(UNAME)" == "Darwin" ] && sedi=(-i '') ; \
+	sed "$${sedi[@]}" -e 's/port: 443/port: {{ .Values.webhook.port }}/' ./helm/smi-controller/templates/apiextensions.k8s.io_v1_customresourcedefinition_*.yaml
 
 # Delete extra files
 	rm ./helm/smi-controller/templates/v1_service_smi-controller-controller-manager-metrics-service.yaml

diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,12 +3,12 @@ entries:
   smi-controller:
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-07-07T11:03:12.6044092+01:00"
+    created: "2021-10-27T10:01:52.386136-05:00"
     description: A Helm chart for installing the SMI Controller for Kubernetes
-    digest: 57ded2d3a1891c5847b6d1bf361f3687cf82b9a171a5a6932eef2de4ca04e4b0
+    digest: 05acf92c7bef959c26c2f7e8e71645e4fea9c9ca18d1af138bbfae54ecbfef4a
     name: smi-controller
     type: application
     urls:
     - smi-controller-0.1.0.tgz
     version: 0.1.0
-generated: "2021-07-07T11:03:12.6033949+01:00"
+generated: "2021-10-27T10:01:52.385317-05:00"
diff --git a/docs/smi-controller-0.1.0.tgz b/docs/smi-controller-0.1.0.tgz
diff --git a/...s/apiextensions.k8s.io_v1_customresourcedefinition_httproutegroups.specs.smi-spec.io.yaml b/...s/apiextensions.k8s.io_v1_customresourcedefinition_httproutegroups.specs.smi-spec.io.yaml
@@ -22,6 +22,8 @@ spec:
     kind: HTTPRouteGroup
     listKind: HTTPRouteGroupList
     plural: httproutegroups
+    shortNames:
+    - htr
     singular: httproutegroup
   scope: Namespaced
   versions:

diff --git a/...mplates/apiextensions.k8s.io_v1_customresourcedefinition_tcproutes.specs.smi-spec.io.yaml b/...mplates/apiextensions.k8s.io_v1_customresourcedefinition_tcproutes.specs.smi-spec.io.yaml
@@ -22,6 +22,8 @@ spec:
     kind: TCPRoute
     listKind: TCPRouteList
     plural: tcproutes
+    shortNames:
+    - tr
     singular: tcproute
   scope: Namespaced
   versions:

diff --git a/...tes/apiextensions.k8s.io_v1_customresourcedefinition_trafficsplits.split.smi-spec.io.yaml b/...tes/apiextensions.k8s.io_v1_customresourcedefinition_trafficsplits.split.smi-spec.io.yaml
@@ -22,6 +22,8 @@ spec:
     kind: TrafficSplit
     listKind: TrafficSplitList
     plural: trafficsplits
+    shortNames:
+    - ts
     singular: trafficsplit
   scope: Namespaced
   versions:

diff --git a/...s/apiextensions.k8s.io_v1_customresourcedefinition_traffictargets.access.smi-spec.io.yaml b/...s/apiextensions.k8s.io_v1_customresourcedefinition_traffictargets.access.smi-spec.io.yaml
@@ -22,6 +22,8 @@ spec:
     kind: TrafficTarget
     listKind: TrafficTargetList
     plural: traffictargets
+    shortNames:
+    - tt
     singular: traffictarget
   scope: Namespaced
   versions:

diff --git a/...mplates/apiextensions.k8s.io_v1_customresourcedefinition_udproutes.specs.smi-spec.io.yaml b/...mplates/apiextensions.k8s.io_v1_customresourcedefinition_udproutes.specs.smi-spec.io.yaml
@@ -22,6 +22,8 @@ spec:
     kind: UDPRoute
     listKind: UDPRouteList
     plural: udproutes
+    shortNames:
+    - ur
     singular: udproute
   scope: Namespaced
   versions: