hitachienergy · seriva · Nov 8, 2019 · Oct 30, 2019 · Oct 31, 2019 · Oct 31, 2019
diff --git a/CHANGELOG-0.4.md b/CHANGELOG-0.4.md
@@ -1,9 +1,18 @@
 # Changelog 0.4
 
-## [0.4.1] 2019-10-17
+## [0.4.2] 2019-11-TOCHANGE
+
+### Added
+
+- Offline upgrade for K8n and Docker
 
 ### Fixed
 
+- [#612](https://github.com/epiphany-platform/epiphany/issues/694) - epicli apply does not remove from build files removed from sources
+
+## [0.4.1] 2019-10-17
+
+### Fixed
 
 - [#612](https://github.com/epiphany-platform/epiphany/issues/612) - 'epicli delete' - cannot delete a partially built infrastructure
 - [#613](https://github.com/epiphany-platform/epiphany/pull/613) - Hotfixes for Ubuntu offline installation in air-gap mode

diff --git a/core/src/epicli/cli/engine/ansible/AnsibleRunner.py b/core/src/epicli/cli/engine/ansible/AnsibleRunner.py
@@ -42,9 +42,12 @@ def playbook_path(self, name):
     def copy_resources(self):
         self.logger.info('Copying Ansible resources')
         if self.cluster_model != None:
-            copy_files_recursively(AnsibleRunner.ANSIBLE_PLAYBOOKS_PATH, get_ansible_path(self.cluster_model.specification.name))
+            ansible_dir = get_ansible_path(self.cluster_model.specification.name)
         else:
-            copy_files_recursively(AnsibleRunner.ANSIBLE_PLAYBOOKS_PATH, get_ansible_path_for_build(self.build_dir))
+            ansible_dir = get_ansible_path_for_build(self.build_dir)
+
+        shutil.rmtree(ansible_dir, ignore_errors=True)              
+        copy_files_recursively(AnsibleRunner.ANSIBLE_PLAYBOOKS_PATH, ansible_dir)          
 
         # copy skopeo so Ansible can move it to the repositry machine
         if not Config().offline_requirements:

diff --git a/core/src/epicli/cli/helpers/Config.py b/core/src/epicli/cli/helpers/Config.py
@@ -113,6 +113,9 @@ def offline_requirements(self):
         @offline_requirements.setter
         def offline_requirements(self, offline_requirements):
             if not offline_requirements is None:
+                if not os.path.isdir(offline_requirements):
+                    raise Exception(f'offline_requirements path "{offline_requirements}" is not a valid path.')
+
                 # To make sure Ansible copies the content of the folder the the repository host.
                 if not offline_requirements.endswith('/'):
                     offline_requirements =  f'{offline_requirements}/'

diff --git a/core/src/epicli/cli/version.py b/core/src/epicli/cli/version.py
@@ -1 +1 @@
-VERSION = '0.4.1'
+VERSION = '0.4.2'
diff --git a/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml b/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml
@@ -1,5 +1,5 @@
 kind: epiphany-cluster
-version: 0.4.1
+version: 0.4.2
 title: "Epiphany cluster Config"
 provider: any
 name: "default"

diff --git a/core/src/epicli/data/aws/defaults/configuration/minimal-cluster-config.yml b/core/src/epicli/data/aws/defaults/configuration/minimal-cluster-config.yml
@@ -1,5 +1,5 @@
 kind: epiphany-cluster
-version: 0.4.1
+version: 0.4.2
 title: "Epiphany cluster Config"
 provider: aws
 name: "default"

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/default-security-group.yml b/core/src/epicli/data/aws/defaults/infrastructure/default-security-group.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/default-security-group
-version: 0.4.1
+version: 0.4.2
 title: "Default Security Group Config"
 provider: aws
 name: default-security-group

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml b/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/efs-storage
-version: 0.4.1
+version: 0.4.2
 title: "Elastic File System Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/internet-gateway.yml b/core/src/epicli/data/aws/defaults/infrastructure/internet-gateway.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/internet-gateway
-version: 0.4.1
+version: 0.4.2
 title: "Internet Gateway Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/launch-configuration.yml b/core/src/epicli/data/aws/defaults/infrastructure/launch-configuration.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/launch-configuration
-version: 0.4.1
+version: 0.4.2
 title: "Launch configuration"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/public-key.yml b/core/src/epicli/data/aws/defaults/infrastructure/public-key.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/public-key
-version: 0.4.1
+version: 0.4.2
 title: "Public Key"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/resource-group.yml b/core/src/epicli/data/aws/defaults/infrastructure/resource-group.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/resource-group
-version: 0.4.1
+version: 0.4.2
 title: "Resource Group"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/route-table-association.yml b/core/src/epicli/data/aws/defaults/infrastructure/route-table-association.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/route-table-association
-version: 0.4.1
+version: 0.4.2
 title: Route Table Association Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/route-table.yml b/core/src/epicli/data/aws/defaults/infrastructure/route-table.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/route-table
-version: 0.4.1
+version: 0.4.2
 title: "Route Table Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/security-group-rule.yml b/core/src/epicli/data/aws/defaults/infrastructure/security-group-rule.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/security-group-rule
-version: 0.4.1
+version: 0.4.2
 title: "Default Group Rule"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/security-group.yml b/core/src/epicli/data/aws/defaults/infrastructure/security-group.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/security-group
-version: 0.4.1
+version: 0.4.2
 title: "Security Group Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/subnet.yml b/core/src/epicli/data/aws/defaults/infrastructure/subnet.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/subnet
-version: 0.4.1
+version: 0.4.2
 title: "Subnet Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: default
@@ -13,7 +13,7 @@ specification:
   authorized_to_efs: false
   mount_efs: false
   tags:
-    - version: 0.4.1
+    - version: 0.4.2
   size: t2.micro
   os_full_name: "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20190212.1"
   os_type: linux
@@ -84,13 +84,13 @@ specification:
 
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: default-size-t3
 specification:
   tags:
-    - version: 0.4.1
+    - version: 0.4.2
   size: t3.micro
   os_type: linux
   security:
@@ -117,13 +117,13 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: rabbitmq-machine
 specification:
   tags:
-    - version: 0.4.1
+    - version: 0.4.2
   size: t3.micro
   os_type: linux
   security:
@@ -190,13 +190,13 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: load-balancer-machine
 specification:
   tags:
-    - version: 0.4.1
+    - version: 0.4.2
   size: t3.micro
   os_type: linux
   security:
@@ -243,7 +243,7 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: kubernetes-master-machine
@@ -343,7 +343,7 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: kubernetes-node-machine
@@ -421,7 +421,7 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: kafka-machine
@@ -547,7 +547,7 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: monitoring-machine
@@ -607,7 +607,7 @@ specification:
        destination_address_prefix: "0.0.0.0/0"
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: postgresql-machine
@@ -681,7 +681,7 @@ specification:
        destination_address_prefix: "0.0.0.0/0"  
 ---
 kind: infrastructure/virtual-machine
-version: 0.4.1
+version: 0.4.2
 title: "Virtual Machine Infra"
 provider: aws
 name: logging-machine

diff --git a/core/src/epicli/data/aws/defaults/infrastructure/vpc.yml b/core/src/epicli/data/aws/defaults/infrastructure/vpc.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/vpc
-version: 0.4.1
+version: 0.4.2
 title: "VPC Config"
 provider: aws
 name: default

diff --git a/core/src/epicli/data/azure/defaults/configuration/minimal-cluster-config.yml b/core/src/epicli/data/azure/defaults/configuration/minimal-cluster-config.yml
@@ -1,5 +1,5 @@
 kind: epiphany-cluster
-version: 0.4.1
+version: 0.4.2
 title: "Epiphany cluster Config"
 provider: azure
 name: "default"

diff --git a/core/src/epicli/data/azure/defaults/infrastructure/network-interface.yml b/core/src/epicli/data/azure/defaults/infrastructure/network-interface.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/network-interface
-version: 0.4.1
+version: 0.4.2
 title: "Network Interface Config"
 provider: azure
 name: default

diff --git a/core/src/epicli/data/azure/defaults/infrastructure/network-security-group.yml b/core/src/epicli/data/azure/defaults/infrastructure/network-security-group.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/network-security-group
-version: 0.4.1
+version: 0.4.2
 title: "Security Group Config"
 provider: azure
 name: default

diff --git a/core/src/epicli/data/azure/defaults/infrastructure/public-ip.yml b/core/src/epicli/data/azure/defaults/infrastructure/public-ip.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/public-ip
-version: 0.4.1
+version: 0.4.2
 title: "Public IP Config"
 provider: azure
 name: default

diff --git a/core/src/epicli/data/azure/defaults/infrastructure/resource-group.yml b/core/src/epicli/data/azure/defaults/infrastructure/resource-group.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/resource-group
-version: 0.4.1
+version: 0.4.2
 title: "Resource Group"
 provider: azure
 name: default

diff --git a/core/src/epicli/data/azure/defaults/infrastructure/storage-share.yml b/core/src/epicli/data/azure/defaults/infrastructure/storage-share.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/storage-share
-version: 0.4.1
+version: 0.4.2
 title: "Azure shared storage"
 provider: azure
 name: default

diff --git a/...c/epicli/data/azure/defaults/infrastructure/subnet-network-security-group-association.yml b/...c/epicli/data/azure/defaults/infrastructure/subnet-network-security-group-association.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/subnet-network-security-group-association
-version: 0.4.1
+version: 0.4.2
 title: "Subnet Network Security Group Association"
 provider: azure
 name: default

diff --git a/core/src/epicli/data/azure/defaults/infrastructure/subnet.yml b/core/src/epicli/data/azure/defaults/infrastructure/subnet.yml
@@ -1,5 +1,5 @@
 kind: infrastructure/subnet
-version: 0.4.1
+version: 0.4.2
 title: "Subnet Config"
 provider: azure
 name: default