Restructured Chart

.gitignore

@@ -353,3 +353,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Chart-tgzs generated by dependency update
+charts/osm-arc/charts

Makefile

@@ -3,6 +3,9 @@ KIND_VERSION ?= 0.8.1
 KUBERNETES_VERSION ?= v1.19.0
 HELM_VERSION ?= 3.3.4
 
+package-osm-chart:
+	helm dependency update osm-arc
+
 e2e-bootstrap:
 	# Download and install kind
 	curl -L https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-linux-amd64 --output ${GITHUB_WORKSPACE}/bin/kind && chmod +x ${GITHUB_WORKSPACE}/bin/kind
@@ -23,7 +26,7 @@ e2e-helm-deploy:
 	mkdir -p .staging/helm
 	curl https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz > .staging/helm/helmbin.tar.gz
 	cd .staging/helm && tar -xvf helmbin.tar.gz
-	./.staging/helm/linux-amd64/helm install osm ./charts/osm --namespace arc-osm-system
+	./.staging/helm/linux-amd64/helm install osm ./charts/osm-arc --namespace arc-osm-system --dependency-update
 
 test-e2e:
 	bats -t test/bats/test.bats

charts/osm-arc/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: osm
+  repository: https://openservicemesh.github.io/osm
+  version: 0.5.0
+digest: sha256:343d510c411a72e9abe9b9a740b0105c206271b813024917969ba0f7ecd4d8a6
+generated: "2020-11-13T13:54:31.7602449-05:00"

charts/osm/Chart.yaml → charts/osm-arc/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-name: osm
-description: A Helm chart to install the OSM control plane on Kubernetes
+name: osm-arc
+description: A Helm chart to install the OSM control plane on Azure Arc enabled Kubernetes clusters.
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -14,8 +14,16 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.4.2
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.5.0
 
 # This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v0.4.2
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: v0.5.0
+
+dependencies: 
+- name: osm
+  version: "0.5.0"
+  repository: "https://openservicemesh.github.io/osm"
+

charts/osm/templates/osm-label.yml → charts/osm-arc/templates/osm-label.yml

@@ -6,7 +6,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: osm-label-account
-  namespace: {{ .Values.OpenServiceMesh.namespace }}
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "20"
     "helm.sh/hook": pre-install
@@ -37,7 +37,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: osm-label-account
-  namespace: {{ .Values.OpenServiceMesh.namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: osm-label-cluster-role
@@ -55,7 +55,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: osm-label-account
-  namespace: {{ .Values.OpenServiceMesh.namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: osm-label-cluster-role
@@ -73,7 +73,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: osm-label-account
-  namespace: {{ .Values.OpenServiceMesh.namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: osm-label-cluster-role
@@ -83,7 +83,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: osm-label
-  namespace: {{ .Values.OpenServiceMesh.namespace }}
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "35"
     "helm.sh/hook": pre-install
@@ -109,7 +109,7 @@ spec:
             - name: labelnamespaces
               value: {{ .Values.OpenServiceMesh.ignoreNamespaces }}
             - name: osmnamespace
-              value: {{ .Values.OpenServiceMesh.namespace }}
+              value: {{ .Release.Namespace }}
           securityContext:
             allowPrivilegeEscalation: false
           command: 

charts/osm-arc/values.yaml

@@ -0,0 +1,27 @@
+# Default values for osm-arc.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+OpenServiceMesh:
+    ignoreNamespaces: "kube-system azure-arc arc-osm-system"
+
+osm:
+  OpenServiceMesh:
+    enableDebugServer: true
+    enablePermissiveTrafficPolicy: true
+    enableFluentbit: true
+    image:
+      registry: mcr.microsoft.com/oss/openservicemesh
+    fluentBitImage:
+      name: fluentbit-logger
+      registry: "mcr.microsoft.com/oss/fluent"
+      tag: "v1.6.2"
+      pullPolicy: IfNotPresent
+    enforceSingleMesh: true
+    enablePrometheus: false
+    deployJaeger: false
+    sidecarImage: mcr.microsoft.com/oss/envoyproxy/envoy:v1.15.0
+
+alpine:
+  image:
+    name: "mcr.microsoft.com/azure-policy/alpine"
+    tag: "prod_20200505.1"