[SEBA-494] Setting required core version
Change-Id: Ib09474e374ff61d59c2c141ca66a96d367f34130
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 5c83c6b..aa533a0 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -15,7 +15,7 @@
# docker build -t xosproject/kubernetes-synchronizer:candidate -f Dockerfile.synchronizer .
# xosproject/kubernetes-synchronizer
-FROM xosproject/xos-synchronizer-base:2.1.54
+FROM xosproject/xos-synchronizer-base:2.2.1
COPY xos/synchronizer /opt/xos/synchronizers/kubernetes
COPY VERSION /opt/xos/synchronizers/kubernetes/
diff --git a/xos/synchronizer/config.yaml b/xos/synchronizer/config.yaml
index 0eaab8b..49fc393 100644
--- a/xos/synchronizer/config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,6 +15,7 @@
name: kubernetes
+core_version: ">=2.2.1"
required_models:
- KubernetesService
- KubernetesServiceInstance
diff --git a/xos/synchronizer/migrations/0002_auto_20190222_1340.py b/xos/synchronizer/migrations/0002_auto_20190222_1340.py
new file mode 100644
index 0000000..ca867cc
--- /dev/null
+++ b/xos/synchronizer/migrations/0002_auto_20190222_1340.py
@@ -0,0 +1,39 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2019-02-22 18:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('kubernetes', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='kubernetesresourceinstance',
+ name='kubectl_state',
+ field=models.CharField(blank=True, choices=[(b'created', b'CREATED'), (b'updated', b'UPDATED'), (b'deleted', b'DELETED')], help_text=b'Most recent kubectl action completed by synchronizer', max_length=32, null=True),
+ ),
+ migrations.AlterField(
+ model_name='kubernetesresourceinstance',
+ name='resource_definition',
+ field=models.CharField(blank=True, help_text=b'yaml containing kubernetes resources', max_length=65535, null=True),
+ ),
+ ]
diff --git a/xos/synchronizer/pull_steps/pull_pods.py b/xos/synchronizer/pull_steps/pull_pods.py
index 961fdb8..661d304 100644
--- a/xos/synchronizer/pull_steps/pull_pods.py
+++ b/xos/synchronizer/pull_steps/pull_pods.py
@@ -186,6 +186,7 @@
name = container.image
tag = "master"
+ # FIXME image.name is unique, but tag may differ. Update validation in the Image model so that the combination of name and tag is unique
existing_images = Image.objects.filter(name=name, tag=tag, kind="container")
if not existing_images:
i = Image(name=name, tag=tag, kind="container", xos_managed=False)