No need for two charts for test receivers 24/324/2
authorTommy Carpenter <tommy@research.att.com>
Wed, 12 Jun 2019 13:25:48 +0000 (09:25 -0400)
committerTommy Carpenter <tommy@research.att.com>
Wed, 12 Jun 2019 13:47:40 +0000 (09:47 -0400)
Change-Id: Ieb8c7acf57948e3a7bdecbc0fa59bedc20fa0348
Signed-off-by: Tommy Carpenter <tommy@research.att.com>
13 files changed:
docs/developer-guide.rst
integration_tests/delayreceiver/.helmignore [deleted file]
integration_tests/delayreceiver/Chart.yaml [deleted file]
integration_tests/delayreceiver/templates/_helpers.tpl [deleted file]
integration_tests/delayreceiver/templates/config.yaml [deleted file]
integration_tests/delayreceiver/templates/deployment.yaml [deleted file]
integration_tests/delayreceiver/templates/service.yaml [deleted file]
integration_tests/delayreceiver/values.yaml [deleted file]
integration_tests/testreceiver/templates/config.yaml
integration_tests/testreceiver/templates/deployment.yaml
integration_tests/testreceiver/templates/service.yaml
integration_tests/testreceiver/values.yaml
tox-integration.ini

index f9a95cc..fc69326 100644 (file)
@@ -37,12 +37,12 @@ This project follows semver. When changes are made, the versions are in:
 
 3) ``container-tag.yaml``
 
-4) ``a1mediator/values.yaml``
-
-5) ``a1mediator/Chart.yaml``
+4) ``integration_tests/a1mediator/values.yaml + ``Chart.yaml``
 
 6) ``a1/openapi.yml``
 
+7) in the it/dep repo that contains a1 helm chart, ``values.yaml``, ``Chart.yml``
+
 Running locally
 ===============
 
diff --git a/integration_tests/delayreceiver/.helmignore b/integration_tests/delayreceiver/.helmignore
deleted file mode 100644 (file)
index 50af031..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/integration_tests/delayreceiver/Chart.yaml b/integration_tests/delayreceiver/Chart.yaml
deleted file mode 100644 (file)
index 8ad2c2b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: Test receiver for a1 integration tests
-name: delayreceiver
-version: 0.1.0
diff --git a/integration_tests/delayreceiver/templates/_helpers.tpl b/integration_tests/delayreceiver/templates/_helpers.tpl
deleted file mode 100644 (file)
index ce5f322..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "delayreceiver.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "delayreceiver.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "delayreceiver.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "delayreceiver.labels" -}}
-app.kubernetes.io/name: {{ include "delayreceiver.name" . }}
-helm.sh/chart: {{ include "delayreceiver.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/integration_tests/delayreceiver/templates/config.yaml b/integration_tests/delayreceiver/templates/config.yaml
deleted file mode 100644 (file)
index a42f325..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: delayreceiverconf
-data:
-  local.rt: |
-    newrt|start
-    rte|10000|{{ .Values.rmrservice.name }}:{{ .Values.rmrservice.port }}
-    rte|10001|a1rmrservice:4562
-    newrt|end
-
diff --git a/integration_tests/delayreceiver/templates/deployment.yaml b/integration_tests/delayreceiver/templates/deployment.yaml
deleted file mode 100644 (file)
index cae53c4..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "delayreceiver.fullname" . }}
-  labels:
-{{ include "delayreceiver.labels" . | indent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "delayreceiver.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "delayreceiver.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: delayreceiver
-          image: testreceiver:latest
-          imagePullPolicy: Never
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: delayreceiverconf
-              mountPath: /opt/route/local.rt
-              subPath: local.rt
-          env:
-          - name: RMR_RCV_RETRY_INTERVAL
-            value: "500"
-          - name: RMR_RETRY_TIMES
-            value: "10"
-          - name: TEST_RCV_PORT
-            value: "{{ .Values.rmrservice.port }}"
-          - name: TEST_RCV_RETURN_MINT
-            value: "10001"
-          - name: TEST_RCV_SEC_DELAY
-            value: "5"
-          - name: TEST_RCV_RETURN_PAYLOAD
-            value: '{"ACK_FROM": "DELAYED_TEST", "status": "SUCCESS"}'
-
-      volumes:
-        - name: "delayreceiverconf"
-          configMap:
-            name: "delayreceiverconf"
diff --git a/integration_tests/delayreceiver/templates/service.yaml b/integration_tests/delayreceiver/templates/service.yaml
deleted file mode 100644 (file)
index 04a5bfb..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.rmrservice.name }}
-  labels:
-{{ include "delayreceiver.labels" . | indent 4 }}
-spec:
-  type: {{ .Values.rmrservice.type }}
-  ports:
-    - port: {{ .Values.rmrservice.port }}
-      targetPort: {{ .Values.rmrservice.port }}
-      protocol: TCP
-  selector:
-    app.kubernetes.io/name: {{ include "delayreceiver.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/integration_tests/delayreceiver/values.yaml b/integration_tests/delayreceiver/values.yaml
deleted file mode 100644 (file)
index 1655808..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# Default values for delayreceiver.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-rmrservice:
-  name: delayreceiverrmrservice
-  type: ClusterIP
-  port: 4563
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths: []
-
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
index 36a379b..e958e31 100644 (file)
@@ -5,7 +5,19 @@ metadata:
 data:
   local.rt: |
     newrt|start
-    rte|20000|{{ .Values.rmrservice.name }}:{{ .Values.rmrservice.port }}
+    rte|20000|{{ .Values.testrmrservice.name }}:{{ .Values.testrmrservice.port }}
     rte|20001|a1rmrservice:4562
     newrt|end
 
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: delayreceiverconf
+data:
+  local.rt: |
+    newrt|start
+    rte|10000|{{ .Values.delayrmrservice.name }}:{{ .Values.delayrmrservice.port }}
+    rte|10001|a1rmrservice:4562
+    newrt|end
index 2d49f6e..b6e5c4e 100644 (file)
@@ -26,7 +26,33 @@ spec:
             - name: testreceiverconf
               mountPath: /opt/route/local.rt
               subPath: local.rt
+        - name: delayreceiver
+          image: testreceiver:latest
+          imagePullPolicy: Never
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: delayreceiverconf
+              mountPath: /opt/route/local.rt
+              subPath: local.rt
+          env:
+          - name: RMR_RCV_RETRY_INTERVAL
+            value: "500"
+          - name: RMR_RETRY_TIMES
+            value: "10"
+          - name: TEST_RCV_PORT
+            value: "{{ .Values.delayrmrservice.port }}"
+          - name: TEST_RCV_RETURN_MINT
+            value: "10001"
+          - name: TEST_RCV_SEC_DELAY
+            value: "5"
+          - name: TEST_RCV_RETURN_PAYLOAD
+            value: '{"ACK_FROM": "DELAYED_TEST", "status": "SUCCESS"}'
+
       volumes:
         - name: "testreceiverconf"
           configMap:
             name: "testreceiverconf"
+        - name: "delayreceiverconf"
+          configMap:
+            name: "delayreceiverconf"
index 7c32ff9..1df7654 100644 (file)
@@ -1,14 +1,32 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.rmrservice.name }}
+  name: {{ .Values.testrmrservice.name }}
   labels:
 {{ include "testreceiver.labels" . | indent 4 }}
 spec:
-  type: {{ .Values.rmrservice.type }}
+  type: {{ .Values.testrmrservice.type }}
   ports:
-    - port: {{ .Values.rmrservice.port }}
-      targetPort: {{ .Values.rmrservice.port }}
+    - port: {{ .Values.testrmrservice.port }}
+      targetPort: {{ .Values.testrmrservice.port }}
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: {{ include "testreceiver.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.delayrmrservice.name }}
+  labels:
+{{ include "testreceiver.labels" . | indent 4 }}
+spec:
+  type: {{ .Values.delayrmrservice.type }}
+  ports:
+    - port: {{ .Values.delayrmrservice.port }}
+      targetPort: {{ .Values.delayrmrservice.port }}
       protocol: TCP
   selector:
     app.kubernetes.io/name: {{ include "testreceiver.name" . }}
index e0b8f40..5a1b9c3 100644 (file)
@@ -4,11 +4,18 @@
 
 replicaCount: 1
 
-rmrservice:
+testrmrservice:
   name: testreceiverrmrservice
   type: ClusterIP
   port: 4560
 
+delayrmrservice:
+  name: delayreceiverrmrservice
+  type: ClusterIP
+  port: 4563
+
+
+
 ingress:
   enabled: false
   annotations: {}
index fb005a0..b3a9183 100644 (file)
@@ -30,7 +30,6 @@ deps =
 changedir=integration_tests
 commands_pre=
     helm install --devel testreceiver -n testreceiver
-    helm install --devel delayreceiver -n delayreceiver
     helm install --devel a1mediator/ -n a1
     sleep 10
     ./portforward.sh
@@ -45,8 +44,6 @@ commands=
 commands_post=
     helm delete testreceiver
     helm del --purge testreceiver
-    helm delete delayreceiver
-    helm del --purge delayreceiver
     helm delete a1
     helm del --purge a1
     pkill -9 kubectl