Restructured Chart

Makefile

@@ -23,7 +23,8 @@ 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 dependency update ./charts/osm-arc
+	./.staging/helm/linux-amd64/helm install osm ./charts/osm-arc --namespace arc-osm-system
 
 test-e2e:
 	bats -t test/bats/test.bats

charts/osm-arc/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/osm-arc/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: osm
+  repository: file://../../charts/osm
+  version: 0.5.0-rc.1
+digest: sha256:d1226533d04b95e18f2f0763a5c8a0bef8378917c5c7dbca83a84194cdf6eebb
+generated: "2020-11-11T19:27:13.3389966-05:00"

charts/osm-arc/Chart.yaml

@@ -0,0 +1,29 @@
+apiVersion: v2
+name: osm-arc
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+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.
+# 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. 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-rc.1"
+  repository: "file://../../charts/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,29 @@
+# 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
+    fluentBitImage:
+      name: fluentbit-logger
+      registry: "mcr.microsoft.com/oss/fluent"
+      tag: "v1.6.2"
+      pullPolicy: IfNotPresent
+    enforceSingleMesh: true
+    enablePrometheus: false
+    deployJaeger: false
+    customLogAnalyticsWorkspace: false
+    customerID: 49a4d43a-81ef-4607-83f6-a13872c6ae60
+    sharedKey: 5q+pyUKQtxtef8ZGTb+aYYcFWR54lmtXpA0AYWJSqUOGBRd9AHgDZZmb0uuLpjOjIMZTp+F3F4e5JUMOWUmHHw==
+    fluentbitOutput: azure
+    webhookConfigNamePrefix: arc-osm-webhook
+
+alpine:
+  image:
+    name: "mcr.microsoft.com/azure-policy/alpine"
+    tag: "prod_20200505.1"

charts/osm/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: osm-arc
+  repository: file://../../charts/osm-arc
+  version: 0.1.0
+digest: sha256:d86a5f1460388d13ef009984e1a2bc78a35035ac7a2e1805f1de1ea510532647
+generated: "2020-11-09T19:21:38.9345356-05:00"

charts/osm/Chart.yaml

@@ -14,8 +14,8 @@ 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
+version: 0.5.0-rc.1
 
 # 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
+appVersion: v0.5.0-rc.1

charts/osm/README.md

@@ -1,6 +1,6 @@
 # osm
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.3.0](https://img.shields.io/badge/AppVersion-v0.3.0-informational?style=flat-square)
+![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.2](https://img.shields.io/badge/AppVersion-v0.4.2-informational?style=flat-square)
 
 A Helm chart to install the OSM control plane on Kubernetes
 
@@ -9,7 +9,7 @@ A Helm chart to install the OSM control plane on Kubernetes
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | OpenServiceMesh.caBundleSecretName | string | `"osm-ca-bundle"` |  |
-| OpenServiceMesh.certficateManager | string | `"tresor"` |  |
+| OpenServiceMesh.certificateManager | string | `"tresor"` |  |
 | OpenServiceMesh.certmanager.issuerGroup | string | `"cert-manager"` |  |
 | OpenServiceMesh.certmanager.issuerKind | string | `"Issuer"` |  |
 | OpenServiceMesh.certmanager.issuerName | string | `"osm-ca"` |  |
@@ -18,27 +18,28 @@ A Helm chart to install the OSM control plane on Kubernetes
 | OpenServiceMesh.enableDebugServer | bool | `false` |  |
 | OpenServiceMesh.enableEgress | bool | `false` |  |
 | OpenServiceMesh.enableGrafana | bool | `false` |  |
-| OpenServiceMesh.enablePrometheus | bool | `true` |  |
+| OpenServiceMesh.enableFluentbit | bool | `false` |  |
 | OpenServiceMesh.enablePermissiveTrafficPolicy | bool | `false` |  |
+| OpenServiceMesh.enablePrometheus | bool | `true` |  |
 | OpenServiceMesh.envoyLogLevel | string | `"error"` |  |
 | OpenServiceMesh.grafana.port | int | `3000` |  |
 | OpenServiceMesh.image.pullPolicy | string | `"IfNotPresent"` |  |
 | OpenServiceMesh.image.registry | string | `"openservicemesh"` |  |
-| OpenServiceMesh.image.tag | string | `"v0.3.0"` |  |
-| OpenServiceMesh.imagePullSecrets | object | `{}` |  |
-| OpenServiceMesh.meshCIDRRanges | string | `"0.0.0.0/0"` |  |
+| OpenServiceMesh.image.tag | string | `"v0.4.2"` |  |
+| OpenServiceMesh.imagePullSecrets | list | `[]` |  |
 | OpenServiceMesh.meshName | string | `"osm"` |  |
 | OpenServiceMesh.prometheus.port | int | `7070` |  |
 | OpenServiceMesh.prometheus.retention.time | string | `"15d"` |  |
 | OpenServiceMesh.replicaCount | int | `1` |  |
-| OpenServiceMesh.serviceCertValidityMinutes | int | `1` |  |
+| OpenServiceMesh.serviceCertValidityDuration | string | `"24h"` |  |
 | OpenServiceMesh.sidecarImage | string | `"envoyproxy/envoy-alpine:v1.15.0"` |  |
+| OpenServiceMesh.tracing.address | string | `"jaeger.osm-system.svc.cluster.local"` |  |
+| OpenServiceMesh.tracing.enable | bool | `true` |  |
+| OpenServiceMesh.tracing.endpoint | string | `"/api/v2/spans"` |  |
+| OpenServiceMesh.tracing.port | int | `9411` |  |
 | OpenServiceMesh.useHTTPSIngress | bool | `false` |  |
 | OpenServiceMesh.vault.host | string | `nil` |  |
 | OpenServiceMesh.vault.protocol | string | `"http"` |  |
 | OpenServiceMesh.vault.role | string | `"openservicemesh"` |  |
 | OpenServiceMesh.vault.token | string | `nil` |  |
-| OpenServiceMesh.tracing.address | string | `"jaeger.osm-system.svc.cluster.local"` |  |
-| OpenServiceMesh.tracing.enable | bool | `false` |  |
-| OpenServiceMesh.tracing.endpoint | string | `"/api/v2/spans"` |  |
-| OpenServiceMesh.tracing.port | int | `9411` |  |
+| OpenServiceMesh.enforceSingleMesh | bool | `"false"` |  |

charts/osm/crds/experimental/backpressure.yaml

@@ -0,0 +1,21 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: backpressures.policy.openservicemesh.io
+spec:
+  group: policy.openservicemesh.io
+  version: v1alpha1
+  names:
+    kind: Backpressure
+    plural: backpressures
+    singular: backpressure
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          properties:
+            maxConnections:
+              description: "Max number of connections"
+              type: integer
+              pattern: '^[1-9]{1}[0-9]*'