Merge pull request #19 from esara/version-1-0-21

Odigos version v1.0.22
odigos-io · Jan 26, 2024 · f482d80 · f482d80
2 parents 65ff38f + 1019252
commit f482d80
Show file tree

Hide file tree

Showing 26 changed files with 433 additions and 726 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,64 @@ helm repo add odigos https://keyval-dev.github.io/odigos-charts/
 
 Install chart:
 ```console
-helm install my-odigos odigos/odigos --namespace odigos-system --create-namespace
+helm repo update
+helm upgrade --install odigos odigos/odigos --namespace odigos-system --create-namespace
+```
+
+Create community configuration:
+```console
+#!/usr/bin/env bash
+
+cat <<EOF | kubectl create --namespace odigos-system -f -
+apiVersion: odigos.io/v1alpha1
+kind: OdigosConfiguration
+metadata:
+  name: odigos-config
+spec:
+  autoscalerImage: keyval/odigos-autoscaler
+  configVersion: 1
+  defaultSDKs:
+    dotnet:
+      sdkTier: community
+      sdkType: native
+    go:
+      sdkTier: community
+      sdkType: ebpf
+    java:
+      sdkTier: community
+      sdkType: native
+    javascript:
+      sdkTier: community
+      sdkType: native
+    python:
+      sdkTier: community
+      sdkType: native
+  ignoredNamespaces:
+    - odigos-system
+    - kube-system
+    - local-path-storage
+    - istio-system
+    - linkerd
+  instrumentorImage: keyval/odigos-instrumentor
+  odigosVersion: v1.0.22
+  supportedSDKs:
+    dotnet:
+      - sdkTier: community
+        sdkType: native
+    go:
+      - sdkTier: community
+        sdkType: ebpf
+    java:
+      - sdkTier: community
+        sdkType: native
+    javascript:
+      - sdkTier: community
+        sdkType: native
+    python:
+      - sdkTier: community
+        sdkType: native
+  telemetryEnabled: true
+EOF
 ```
 
 ## License

diff --git a/charts/odigos/Chart.yaml b/charts/odigos/Chart.yaml
@@ -15,7 +15,7 @@ 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.2.39
+version: 0.2.40
 
 # 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

diff --git a/charts/odigos/templates/autoscaler/deployment.yaml b/charts/odigos/templates/autoscaler/deployment.yaml
@@ -1,58 +1,44 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    odigos.io/skip: "true"
   labels:
-    app: odigos-autoscaler
+    app.kubernetes.io/name: odigos-autoscaler
   name: odigos-autoscaler
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: odigos-autoscaler
+      app.kubernetes.io/name: odigos-autoscaler
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        app: odigos-autoscaler
+        app.kubernetes.io/name: odigos-autoscaler
     spec:
-{{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 6 }}
-{{- end }}
       containers:
-      - args:
-          - --secure-listen-address=0.0.0.0:8443
-          - --upstream=http://127.0.0.1:8080/
-          - --logtostderr=true
-          - --v=0
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
-        name: apis-rbac-proxy
-        ports:
-          - containerPort: 8443
-            name: https
-            protocol: TCP
       - args:
           - --health-probe-bind-address=:8081
           - --metrics-bind-address=127.0.0.1:8080
           - --leader-elect
-{{- if .Values.imagePullSecrets }}{{ $imagePullSecretsValues := .Values.imagePullSecrets }}{{ $imagePullSecrets := list }}
-{{- range $imagePullSecretsValues }}
-{{- $imagePullSecrets = append $imagePullSecrets (printf "%s" .name) }}
-{{- end }}
-          - --image-pull-secrets={{ join "," $imagePullSecrets }}
-{{- end }}
+          {{ if .Values.image.prefix }}
+          - --image-prefix={{ .Values.image.prefix }}
+          {{ end }}
         command:
           - /app
-        image: "{{ .Values.autoscaler.image.repository }}:{{ .Values.autoscaler.image.tag }}"
+        image: "{{ .Values.autoscaler.image.repository }}:{{ .Values.image.tag }}"
         env:
+          - name: OTEL_SERVICE_NAME
+            value: auto-scaler
           - name: CURRENT_NS
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+        envFrom:
+          - configMapRef:
+              name: odigos-own-telemetry-otel-config
+              optional: true
         livenessProbe:
           httpGet:
             path: /healthz
@@ -74,4 +60,8 @@ spec:
       serviceAccountName: odigos-autoscaler
       terminationGracePeriodSeconds: 10
       nodeSelector:
-        kubernetes.io/os: linux
+        kubernetes.io/os: linux
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 6 }}
+{{- end }}
diff --git a/charts/odigos/templates/autoscaler/role.yaml b/charts/odigos/templates/autoscaler/role.yaml
@@ -8,17 +8,6 @@ rules:
       - ""
     resources:
       - configmaps
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
       - services
     verbs:
       - create
@@ -32,25 +21,6 @@ rules:
       - apps
     resources:
       - daemonsets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - daemonsets/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - apps
-    resources:
       - deployments
     verbs:
       - create
@@ -63,6 +33,7 @@ rules:
   - apiGroups:
       - apps
     resources:
+      - daemonsets/status
       - deployments/status
     verbs:
       - get
@@ -72,31 +43,6 @@ rules:
       - odigos.io
     resources:
       - collectorsgroups
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
       - destinations
     verbs:
       - create
@@ -109,12 +55,14 @@ rules:
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/finalizers
       - destinations/finalizers
     verbs:
       - update
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/status
       - destinations/status
     verbs:
       - get

diff --git a/charts/odigos/templates/crd/collectorsgroup.yaml b/charts/odigos/templates/crd/collectorsgroup.yaml
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
   name: collectorsgroups.odigos.io
 spec:
   group: odigos.io
@@ -14,47 +13,40 @@ spec:
     singular: collectorsgroup
   scope: Namespaced
   versions:
-    - name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: CollectorsGroup is the Schema for the collectors API
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: CollectorsGroupSpec defines the desired state of Collector
-              properties:
-                inputSvc:
-                  type: string
-                role:
-                  enum:
-                    - GATEWAY
-                    - DATA_COLLECTION
-                  type: string
-              required:
-                - role
-              type: object
-            status:
-              description: CollectorsGroupStatus defines the observed state of Collector
-              properties:
-                ready:
-                  type: boolean
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: CollectorsGroup is the Schema for the collectors API
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: CollectorsGroupSpec defines the desired state of Collector
+            properties:
+              inputSvc:
+                type: string
+              role:
+                enum:
+                - GATEWAY
+                - DATA_COLLECTION
+                type: string
+            required:
+            - role
+            type: object
+          status:
+            properties:
+              ready:
+                type: boolean
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""