diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 0e2b18e27..393b092c1 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -59,11 +59,16 @@ "3.5.2" ], "KafkaConnector": [ + "postgres-3.0.5.final", + "mysql-3.0.5.final", + "jdbc-3.0.5.final", "s3-2.15.0", + "postgres-2.7.4.final", + "mysql-2.7.4.final", + "jdbc-2.7.4.final", "jdbc-2.6.1.final", - "postgres-2.4.2.final", - "mysql-2.4.2.final", - "mongodb-1.11.0", + "mongodb-1.14.1", + "mongodb-1.13.1", "gcs-0.13.0" ], "MSSQLServer": [ diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.11.0-mongodb.yaml b/catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-1.11.0-mongodb.yaml similarity index 93% rename from catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.11.0-mongodb.yaml rename to catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-1.11.0-mongodb.yaml index 486fb83e5..c3c7502e0 100644 --- a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.11.0-mongodb.yaml +++ b/catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-1.11.0-mongodb.yaml @@ -5,6 +5,7 @@ metadata: spec: connectorPlugin: image: ghcr.io/appscode-images/kafka-connector-mongodb:1.11.0 + deprecated: true securityContext: runAsUser: 1001 type: MongoDB diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.4.2-mysql.yaml b/catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-2.4.2-mysql.yaml similarity index 93% rename from catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.4.2-mysql.yaml rename to catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-2.4.2-mysql.yaml index 9e97635f1..9009b0d87 100644 --- a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.4.2-mysql.yaml +++ b/catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-2.4.2-mysql.yaml @@ -5,6 +5,7 @@ metadata: spec: connectorPlugin: image: ghcr.io/appscode-images/kafka-connector-mysql:2.4.2.final + deprecated: true securityContext: runAsUser: 1001 type: MySQL diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.4.2-postgres.yaml b/catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-2.4.2-postgres.yaml similarity index 93% rename from catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.4.2-postgres.yaml rename to catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-2.4.2-postgres.yaml index 4d5365916..d82c57aa4 100644 --- a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.4.2-postgres.yaml +++ b/catalog/kubedb/raw/kafkaconnector/deprecated-kafkaconnector-2.4.2-postgres.yaml @@ -5,6 +5,7 @@ metadata: spec: connectorPlugin: image: ghcr.io/appscode-images/kafka-connector-postgres:2.4.2.final + deprecated: true securityContext: runAsUser: 1001 type: Postgres diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.13.1-mongodb.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.13.1-mongodb.yaml new file mode 100644 index 000000000..fbbb5dffa --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.13.1-mongodb.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: mongodb-1.13.1 +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-mongodb:1.13.1 + securityContext: + runAsUser: 1001 + type: MongoDB + version: 1.13.1 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.14.1-mongodb.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.14.1-mongodb.yaml new file mode 100644 index 000000000..aaf90e008 --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-1.14.1-mongodb.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: mongodb-1.14.1 +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-mongodb:1.14.1 + securityContext: + runAsUser: 1001 + type: MongoDB + version: 1.14.1 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-jdbc.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-jdbc.yaml new file mode 100644 index 000000000..34ec713bd --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-jdbc.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: jdbc-2.7.4.final +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-jdbc:2.7.4.final + securityContext: + runAsUser: 1001 + type: JDBC + version: 2.7.4 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-mysql.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-mysql.yaml new file mode 100644 index 000000000..ce82c58bb --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-mysql.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: mysql-2.7.4.final +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-mysql:2.7.4.final + securityContext: + runAsUser: 1001 + type: MySQL + version: 2.7.4 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-postgres.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-postgres.yaml new file mode 100644 index 000000000..5132381d7 --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-2.7.4-postgres.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: postgres-2.7.4.final +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-postgres:2.7.4.final + securityContext: + runAsUser: 1001 + type: Postgres + version: 2.7.4 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-jdbc.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-jdbc.yaml new file mode 100644 index 000000000..86001cc4e --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-jdbc.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: jdbc-3.0.5.final +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-jdbc:3.0.5.final + securityContext: + runAsUser: 1001 + type: JDBC + version: 3.0.5 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-mysql.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-mysql.yaml new file mode 100644 index 000000000..29ce7cc0e --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-mysql.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: mysql-3.0.5.final +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-mysql:3.0.5.final + securityContext: + runAsUser: 1001 + type: MySQL + version: 3.0.5 diff --git a/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-postgres.yaml b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-postgres.yaml new file mode 100644 index 000000000..49ef6cf3a --- /dev/null +++ b/catalog/kubedb/raw/kafkaconnector/kafkaconnector-3.0.5-postgres.yaml @@ -0,0 +1,11 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: postgres-3.0.5.final +spec: + connectorPlugin: + image: ghcr.io/appscode-images/kafka-connector-postgres:3.0.5.final + securityContext: + runAsUser: 1001 + type: Postgres + version: 3.0.5 diff --git a/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-1.11.0-mongodb.yaml b/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-1.11.0-mongodb.yaml new file mode 100644 index 000000000..fba753b64 --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-1.11.0-mongodb.yaml @@ -0,0 +1,23 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} +{{ if or (not .Values.skipDeprecated) (has "mongodb-1.11.0" .Values.enableVersions.Kafka) }} +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'mongodb-1.11.0' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mongodb") $) }}:1.11.0' + securityContext: + runAsUser: 1001 + type: MongoDB + version: 1.11.0 + deprecated: {{ not (has "mongodb-1.11.0" .Values.enableVersions.Kafka) }} +{{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-2.4.2-mysql.yaml b/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-2.4.2-mysql.yaml new file mode 100644 index 000000000..4843ce917 --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-2.4.2-mysql.yaml @@ -0,0 +1,23 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} +{{ if or (not .Values.skipDeprecated) (has "mysql-2.4.2.final" .Values.enableVersions.Kafka) }} +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'mysql-2.4.2.final' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mysql") $) }}:2.4.2.final' + securityContext: + runAsUser: 1001 + type: MySQL + version: 2.4.2 + deprecated: {{ not (has "mysql-2.4.2.final" .Values.enableVersions.Kafka) }} +{{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-2.4.2-postgres.yaml b/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-2.4.2-postgres.yaml new file mode 100644 index 000000000..197b953e5 --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/deprecated-kafkaconnector-2.4.2-postgres.yaml @@ -0,0 +1,23 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} +{{ if or (not .Values.skipDeprecated) (has "postgres-2.4.2.final" .Values.enableVersions.Kafka) }} +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'postgres-2.4.2.final' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-postgres") $) }}:2.4.2.final' + securityContext: + runAsUser: 1001 + type: Postgres + version: 2.4.2 + deprecated: {{ not (has "postgres-2.4.2.final" .Values.enableVersions.Kafka) }} +{{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.11.0-mongodb.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.13.1-mongodb.yaml similarity index 84% rename from charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.11.0-mongodb.yaml rename to charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.13.1-mongodb.yaml index d41ac34b2..f6797bd3d 100644 --- a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.11.0-mongodb.yaml +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.13.1-mongodb.yaml @@ -8,14 +8,14 @@ apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaConnectorVersion metadata: - name: 'mongodb-1.11.0' + name: 'mongodb-1.13.1' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: connectorPlugin: - image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mongodb") $) }}:1.11.0' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mongodb") $) }}:1.13.1' securityContext: runAsUser: 1001 type: MongoDB - version: 1.11.0 + version: 1.13.1 {{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.14.1-mongodb.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.14.1-mongodb.yaml new file mode 100644 index 000000000..cd2cfff3d --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-1.14.1-mongodb.yaml @@ -0,0 +1,21 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'mongodb-1.14.1' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mongodb") $) }}:1.14.1' + securityContext: + runAsUser: 1001 + type: MongoDB + version: 1.14.1 +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-jdbc.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-jdbc.yaml new file mode 100644 index 000000000..40b2dfa19 --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-jdbc.yaml @@ -0,0 +1,21 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'jdbc-2.7.4.final' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-jdbc") $) }}:2.7.4.final' + securityContext: + runAsUser: 1001 + type: JDBC + version: 2.7.4 +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.4.2-mysql.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-mysql.yaml similarity index 83% rename from charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.4.2-mysql.yaml rename to charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-mysql.yaml index 672f3256f..ca644e71e 100644 --- a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.4.2-mysql.yaml +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-mysql.yaml @@ -8,14 +8,14 @@ apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaConnectorVersion metadata: - name: 'mysql-2.4.2.final' + name: 'mysql-2.7.4.final' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: connectorPlugin: - image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mysql") $) }}:2.4.2.final' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mysql") $) }}:2.7.4.final' securityContext: runAsUser: 1001 type: MySQL - version: 2.4.2 + version: 2.7.4 {{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.4.2-postgres.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-postgres.yaml similarity index 82% rename from charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.4.2-postgres.yaml rename to charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-postgres.yaml index 1a697d113..67b7b6077 100644 --- a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.4.2-postgres.yaml +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-2.7.4-postgres.yaml @@ -8,14 +8,14 @@ apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaConnectorVersion metadata: - name: 'postgres-2.4.2.final' + name: 'postgres-2.7.4.final' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: connectorPlugin: - image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-postgres") $) }}:2.4.2.final' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-postgres") $) }}:2.7.4.final' securityContext: runAsUser: 1001 type: Postgres - version: 2.4.2 + version: 2.7.4 {{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-jdbc.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-jdbc.yaml new file mode 100644 index 000000000..079d44cfe --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-jdbc.yaml @@ -0,0 +1,21 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'jdbc-3.0.5.final' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-jdbc") $) }}:3.0.5.final' + securityContext: + runAsUser: 1001 + type: JDBC + version: 3.0.5 +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-mysql.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-mysql.yaml new file mode 100644 index 000000000..5d57cc96a --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-mysql.yaml @@ -0,0 +1,21 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'mysql-3.0.5.final' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-mysql") $) }}:3.0.5.final' + securityContext: + runAsUser: 1001 + type: MySQL + version: 3.0.5 +{{ end }} diff --git a/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-postgres.yaml b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-postgres.yaml new file mode 100644 index 000000000..b1e781b24 --- /dev/null +++ b/charts/kubedb-catalog/templates/kafkaconnector/kafkaconnector-3.0.5-postgres.yaml @@ -0,0 +1,21 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: KafkaConnectorVersion +metadata: + name: 'postgres-3.0.5.final' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + connectorPlugin: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connector-postgres") $) }}:3.0.5.final' + securityContext: + runAsUser: 1001 + type: Postgres + version: 3.0.5 +{{ end }}