Merge pull request #83 from naseemkullah/schema-pod-annotations

[jaeger] Add pod annotations for schema job.
jaegertracing · Mar 27, 2020 · bea041f · bea041f
2 parents cf8d895 + 8ac9f6f
commit bea041f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -7,7 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
 
       - name: Run chart-testing (lint)
         id: lint

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,7 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
 
       - name: Configure Git
         run: |

diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.17.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.26.0
+version: 0.26.1
 keywords:
   - jaeger
   - opentracing

diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md
@@ -230,7 +230,8 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `<component>.env` | Additional environment variables | {} |
 | `<component>.nodeSelector` | Node selector | {} |
 | `<component>.tolerations` | Node tolerations | [] |
-| `<component.affinity` | Affinity | {} |
+| `<component>.affinity` | Affinity | {} |
+| `<component>.podAnnotations` | Pod annotations | `nil` |
 | `<component>.podSecurityContext` | Pod security context | {} |
 | `<component>.securityContext` | Container security context | {} |
 | `<component>.serviceAccount.create` | Create service account | `true` |
@@ -241,7 +242,6 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `agent.service.binaryPort` | jaeger.thrift over binary thrift | `6832` |
 | `agent.service.compactPort` | jaeger.thrift over compact thrift| `6831` |
 | `agent.image` | Image for Jaeger Agent | `jaegertracing/jaeger-agent` |
-| `agent.podAnnotations` | Annotations for Agent pod | `nil` |
 | `agent.pullPolicy` | Agent image pullPolicy | `IfNotPresent` |
 | `agent.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` |
 | `agent.service.annotations` | Annotations for Agent SVC | `nil` |
@@ -256,7 +256,6 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `collector.autoscaling.maxReplicas` | Maximum replicas |  10 |
 | `collector.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization |  80 |
 | `collector.autoscaling.targetMemoryUtilizationPercentage` | Target memory utilization | `nil` |
-| `collector.podAnnotations` | Annotations for Collector pod | `nil` |
 | `collector.image` | Image for jaeger collector | `jaegertracing/jaeger-collector` |
 | `collector.pullPolicy` | Collector image pullPolicy | `IfNotPresent` |
 | `collector.service.annotations` | Annotations for Collector SVC | `nil` |
@@ -275,7 +274,6 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `ingester.autoscaling.maxReplicas` | Maximum replicas |  10 |
 | `ingester.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization |  80 |
 | `ingester.autoscaling.targetMemoryUtilizationPercentage` | Target memory utilization | `nil` |
-| `ingester.podAnnotations` | Annotations for Ingester pod | `nil` |
 | `ingester.service.annotations` | Annotations for Ingester SVC | `nil` |
 | `ingester.image` | Image for jaeger Ingester | `jaegertracing/jaeger-ingester` |
 | `ingester.pullPolicy` | Ingester image pullPolicy | `IfNotPresent` |
@@ -298,7 +296,6 @@ The following table lists the configurable parameters of the Jaeger chart and th
 | `query.ingress.annotations` | Configure annotations for Ingress | `{}` |
 | `query.ingress.hosts` | Configure host for Ingress | `nil` |
 | `query.ingress.tls` | Configure tls for Ingress | `nil` |
-| `query.podAnnotations` | Annotations for Query pod | `nil` |
 | `query.pullPolicy` | Query UI image pullPolicy | `IfNotPresent` |
 | `query.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` |
 | `query.service.nodePort` | Specific node port to use when type is NodePort | `nil` |

diff --git a/charts/jaeger/templates/cassandra-schema-job.yaml b/charts/jaeger/templates/cassandra-schema-job.yaml
@@ -16,6 +16,10 @@ spec:
   template:
     metadata:
       name: {{ include "jaeger.fullname" . }}-cassandra-schema
+{{- if .Values.schema.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.schema.podAnnotations | nindent 8 }}
+{{- end }}
 {{- if .Values.schema.podLabels }}
       labels:
         {{- toYaml .Values.schema.podLabels | nindent 8 }}

diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
@@ -108,8 +108,7 @@ schema:
   serviceAccount:
     create: true
     name:
-  ## Additional pod labels
-  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podAnnotations: {}
   podLabels: {}
   ## Deadline for cassandra schema creation job
   activeDeadlineSeconds: 300