Merge pull request #3189 from snehachhabria/relv0.8.3

chore(release) : Creating release v0.8.3-rc.1

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.8.2
+version: 0.8.3-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.8.2
+appVersion: v0.8.3-rc.1

charts/osm/README.md

@@ -91,11 +91,12 @@ The following table lists the configurable parameters of the osm chart and their
 | OpenServiceMesh.grafana.port | int | `3000` | Grafana port |
 | OpenServiceMesh.image.pullPolicy | string | `"IfNotPresent"` | `osm-controller` pod PullPolicy |
 | OpenServiceMesh.image.registry | string | `"openservicemesh"` | `osm-controller` image registry |
-| OpenServiceMesh.image.tag | string | `"v0.8.2"` | `osm-controller` image tag |
+| OpenServiceMesh.image.tag | string | `"v0.8.3-rc.1"` | `osm-controller` image tag |
 | OpenServiceMesh.imagePullSecrets | list | `[]` | `osm-controller` image pull secret |
-| OpenServiceMesh.injector | object | `{"replicaCount":1,"resource":{"limits":{"cpu":"0.5","memory":"64M"},"requests":{"cpu":"0.3","memory":"64M"}}}` | Sidecar injector configuration |
+| OpenServiceMesh.injector | object | `{"podLabels":{},"replicaCount":1,"resource":{"limits":{"cpu":"0.5","memory":"64M"},"requests":{"cpu":"0.3","memory":"64M"}}}` | Sidecar injector configuration |
 | OpenServiceMesh.meshName | string | `"osm"` | Name for the new control plane instance |
 | OpenServiceMesh.osmNamespace | string | `""` | Optional parameter. If not specified, the release namespace is used to deploy the osm components. |
+| OpenServiceMesh.osmcontroller.podLabels | object | `{}` |  |
 | OpenServiceMesh.osmcontroller.resource.limits.cpu | string | `"1.5"` |  |
 | OpenServiceMesh.osmcontroller.resource.limits.memory | string | `"512M"` |  |
 | OpenServiceMesh.osmcontroller.resource.requests.cpu | string | `"0.5"` |  |
@@ -105,7 +106,7 @@ The following table lists the configurable parameters of the osm chart and their
 | OpenServiceMesh.prometheus.retention.time | string | `"15d"` | Prometheus retention time |
 | OpenServiceMesh.replicaCount | int | `1` | `osm-controller` replicas |
 | OpenServiceMesh.serviceCertValidityDuration | string | `"24h"` | Sets the service certificatevalidity duration |
-| OpenServiceMesh.sidecarImage | string | `"envoyproxy/envoy-alpine:v1.17.1"` | Envoy sidecar image |
+| OpenServiceMesh.sidecarImage | string | `"envoyproxy/envoy-alpine:v1.17.2"` | Envoy sidecar image |
 | OpenServiceMesh.tracing.address | string | `""` | Tracing destination cluster (must contain the namespace). When left empty, this is computed in helper template to "jaeger.<osm-namespace>.svc.cluster.local". Please override for BYO-tracing as documented in tracing.md |
 | OpenServiceMesh.tracing.enable | bool | `false` | Toggles Envoy's tracing functionality on/off for all sidecar proxies in the cluster |
 | OpenServiceMesh.tracing.endpoint | string | `"/api/v2/spans"` | Destination's API or collector endpoint where the spans will be sent to |

charts/osm/templates/_helpers.tpl

@@ -8,3 +8,10 @@
 {{- $address := printf "jaeger.%s.svc.cluster.local" (include "osm.namespace" .) -}}
 {{ default $address .Values.OpenServiceMesh.tracing.address}} 
 {{- end -}}
+
+{{/* Labels to be added to all resources */}}
+{{- define "osm.labels" -}}
+app.kubernetes.io/name: openservicemesh.io
+app.kubernetes.io/instance: {{ .Values.OpenServiceMesh.meshName }}
+app.kubernetes.io/version: {{ .Chart.AppVersion }}
+{{- end -}}

charts/osm/templates/fluentbit-configmap.yaml

@@ -4,6 +4,8 @@ kind: ConfigMap
 metadata:
   name: fluentbit-configmap
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 data:
   fluent-bit.conf: |-
     [SERVICE]

charts/osm/templates/grafana-configmap.yaml

@@ -5,6 +5,7 @@ metadata:
   name: osm-grafana-config
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 data:
   grafana.ini: |
@@ -28,6 +29,7 @@ metadata:
   name: osm-grafana-datasources
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 data:
   prometheus.yaml: |
@@ -64,6 +66,7 @@ metadata:
   name: osm-grafana-dashboard-definition-dataplane
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 data:
   osm-pod.json: |
@@ -81,6 +84,7 @@ metadata:
   name: osm-grafana-dashboard-definition-controlplane
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 data:
   osm-control-plane.json: |
@@ -96,6 +100,7 @@ metadata:
   name: osm-grafana-dashboards
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 data:
   dashboards.yaml: |

charts/osm/templates/grafana-deployment.yaml

@@ -5,6 +5,7 @@ metadata:
   name: osm-grafana
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 spec:
   replicas: 1
@@ -16,6 +17,7 @@ spec:
   template:
     metadata:
       labels:
+        {{- include "osm.labels" . | nindent 8 }}
         app: osm-grafana
     spec:
       serviceAccountName: osm-grafana

charts/osm/templates/grafana-rbac.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
   name: osm-grafana
   namespace: {{ include "osm.namespace" . }}
@@ -13,6 +14,7 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
   name: {{.Release.Name}}-grafana
 rules: []
@@ -24,6 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{.Release.Name}}-grafana
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 subjects:
   - kind: ServiceAccount

charts/osm/templates/grafana-svc.yaml

@@ -5,6 +5,7 @@ metadata:
   name: osm-grafana
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-grafana
 spec:
   ports:

charts/osm/templates/jaeger-deployment.yaml

@@ -5,6 +5,7 @@ metadata:
   name: jaeger
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: jaeger
 spec:
   replicas: 1
@@ -14,6 +15,7 @@ spec:
   template:
     metadata:
       labels:
+        {{- include "osm.labels" . | nindent 8 }}
         app: jaeger
     spec:
       containers:

charts/osm/templates/jaeger-service.yaml

@@ -5,6 +5,7 @@ metadata:
   name: jaeger
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: jaeger
 spec:
   selector:

charts/osm/templates/mutatingwebhook.yaml

@@ -2,7 +2,8 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
   labels:
-    app: osm-controller
+    {{- include "osm.labels" . | nindent 4 }}
+    app: osm-injector
   name: {{.Values.OpenServiceMesh.webhookConfigNamePrefix}}-{{.Values.OpenServiceMesh.meshName}}
 webhooks:
 - name: osm-inject.k8s.io

charts/osm/templates/osm-configmap.yaml

@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   name: osm-config
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 data:
   permissive_traffic_policy_mode: {{ .Values.OpenServiceMesh.enablePermissiveTrafficPolicy | default "false" | quote }}
   egress: {{ .Values.OpenServiceMesh.enableEgress | quote }}

charts/osm/templates/osm-deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   name: osm-controller
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-controller
     meshName: {{ .Values.OpenServiceMesh.meshName }}
     {{ if .Values.OpenServiceMesh.enforceSingleMesh }}enforceSingleMesh: "true"{{ end }}
@@ -15,12 +16,19 @@ spec:
   template:
     metadata:
       labels:
+        {{- include "osm.labels" . | nindent 8 }}
         app: osm-controller
+  {{- if .Values.OpenServiceMesh.osmcontroller.podLabels }}
+  {{- toYaml .Values.OpenServiceMesh.osmcontroller.podLabels | nindent 8 }}
+  {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/port: '9091'
     spec:
       serviceAccountName: {{ .Release.Name }}
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: osm-controller
           image: "{{ .Values.OpenServiceMesh.image.registry }}/osm-controller:{{ .Values.OpenServiceMesh.image.tag }}"

charts/osm/templates/osm-injector-deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   name: osm-injector
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-injector
     meshName: {{ .Values.OpenServiceMesh.meshName }}
 spec:
@@ -14,12 +15,19 @@ spec:
   template:
     metadata:
       labels:
+        {{- include "osm.labels" . | nindent 8 }}
         app: osm-injector
+  {{- if .Values.OpenServiceMesh.injector.podLabels }}
+  {{- toYaml .Values.OpenServiceMesh.injector.podLabels | nindent 8 }}
+  {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/port: '9091'
     spec:
       serviceAccountName: {{ .Release.Name }}
+      nodeSelector:
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
       containers:
         - name: osm-injector
           image: "{{ .Values.OpenServiceMesh.image.registry }}/osm-injector:{{ .Values.OpenServiceMesh.image.tag }}"

charts/osm/templates/osm-injector-service.yaml

@@ -4,6 +4,7 @@ metadata:
   name: osm-injector
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-injector
 spec:
   ports:

charts/osm/templates/osm-rbac.yaml

@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ .Release.Name }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 rules:
   - apiGroups: ["apps"]
     resources: ["daemonsets", "deployments", "replicasets", "statefulsets"]
@@ -53,11 +55,15 @@ kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ .Release.Name }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}

charts/osm/templates/osm-service.yaml

@@ -4,6 +4,7 @@ metadata:
   name: osm-controller
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-controller
 spec:
   ports:
@@ -22,6 +23,7 @@ metadata:
   name: osm-config-validator
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-controller
 spec:
   ports:

charts/osm/templates/prometheus-configmap.yaml

@@ -5,6 +5,7 @@ metadata:
   name: osm-prometheus-server-conf
   namespace: {{ include "osm.namespace" . }}
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     name: osm-prometheus-server-conf
 data:
   prometheus.yml: |

charts/osm/templates/prometheus-deployment.yaml

@@ -4,6 +4,8 @@ kind: Deployment
 metadata:
   name: osm-prometheus
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 spec:
   replicas: 1
   strategy:
@@ -14,6 +16,7 @@ spec:
   template:
     metadata:
       labels:
+        {{- include "osm.labels" . | nindent 8 }}
         app: osm-prometheus
     spec:
       containers:

charts/osm/templates/prometheus-rbac.yaml

@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{.Release.Name}}-prometheus
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["nodes", "nodes/proxy",  "nodes/metrics", "services", "endpoints", "pods", "ingresses", "configmaps"]
@@ -17,6 +19,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{.Release.Name}}-prometheus
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: osm-prometheus
@@ -31,4 +35,6 @@ kind: ServiceAccount
 metadata:
   name: osm-prometheus
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 {{- end }}

charts/osm/templates/prometheus-svc.yaml

@@ -4,6 +4,8 @@ kind: Service
 metadata:
   name: osm-prometheus
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
   annotations:
     prometheus.io/port: "{{.Values.OpenServiceMesh.prometheus.port}}"
     prometheus.io/scrape: "true"

charts/osm/templates/proxy-config.yaml

@@ -4,6 +4,8 @@ kind: Secret
 metadata:
   name: proxy-config
   namespace: {{ include "osm.namespace" . }}
+  labels:
+    {{- include "osm.labels" . | nindent 4 }}
 stringData:
   HTTP_PROXY: {{ .Values.OpenServiceMesh.fluentBit.httpProxy | quote }}
   HTTPS_PROXY: {{ .Values.OpenServiceMesh.fluentBit.httpsProxy | quote }}

charts/osm/templates/validatingwebhook.yaml

@@ -2,6 +2,7 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
   labels:
+    {{- include "osm.labels" . | nindent 4 }}
     app: osm-controller
   name: {{.Values.OpenServiceMesh.webhookConfigNamePrefix}}-{{.Values.OpenServiceMesh.meshName}}
 webhooks:

charts/osm/values.schema.json

@@ -112,6 +112,15 @@
                                             "description": "The resources requests memory for the osmcontroller."
                                         }
                                     }
+                                },
+                                "podLabels": {
+                                    "$id": "#/properties/OpenServiceMesh/properties/osmcontroller/properties/podLabels",
+                                    "type": "array",
+                                    "title": "The podLabels schema",
+                                    "description": "Labels for the osmcontroller pod.",
+                                    "items": {
+                                        "type": "string"
+                                    }
                                 }
                             }
                         }
@@ -173,7 +182,7 @@
                     "title": "The sidecarImage schema",
                     "description": "The proxy side car image to run.",
                     "examples": [
-                        "envoyproxy/envoy-alpine:v1.17.1"
+                        "envoyproxy/envoy-alpine:v1.17.2"
                     ]
                 },
                 "certificateManager": {