diff --git a/_service b/_service
index e980792..d8be25b 100644
--- a/_service
+++ b/_service
@@ -1,37 +1,10 @@
-
- https://github.com/kubic-project/container-images.git
- git
- etcd-image
- etcd-image.kiwi.ini
- master
- %cd
-
-
- https://github.com/kubic-project/container-images.git
- git
- etcd-image/root
- root
- _none_
- master
-
-
- https://github.com/kubic-project/container-images.git
- git
- pre_checkin.sh
- master
- %cd
-
+
kubic-etcd-image.kiwi
- %%SHORT_VERSION%%
- minor
- etcd
-
-
- kubic-etcd-image.kiwi
- %%LONG_VERSION%%
+ %PKG_VERSION%
patch
- etcd
+ etcd-for-k8s-image
+
diff --git a/config.sh b/config.sh
new file mode 100644
index 0000000..9c1d7ce
--- /dev/null
+++ b/config.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#--------------------------------------
+#test -f /.profile && . /.profile
+
+#======================================
+# Greeting...
+#--------------------------------------
+echo "Configure image: [$kiwi_iname]..."
+
+for i in /usr/bin/etcdctl* ; do
+ ln -sf $i /usr/local/bin/`basename $i`
+done
+for i in /usr/sbin/etcd* ; do
+ ln -sf $i /usr/local/bin/`basename $i`
+done
+ln -sf /usr/bin/migrate /usr/local/bin/
+ln -sf /usr/bin/migrate-if-needed.sh /usr/local/bin/
+
+exit 0
diff --git a/etcd-image.kiwi.ini b/etcd-image.kiwi.ini
deleted file mode 100644
index d208509..0000000
--- a/etcd-image.kiwi.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
- SUSE Containers Team
- containers@suse.com
- Etcd running on a _DISTRO_ container guest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4.0.1
- zypper
- false
- true
- true
- en_US
- us.map.gz
- utc
-
-
-
-
-
-
-
-
-
diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index e7907d4..2ab1aaf 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Jul 20 10:22:15 CEST 2019 - kukuk@suse.de
+
+- Split from CaaSP image
+ - add labes
+ - include special etcd package
+ - include etcd migraton script for kubeadm (disabled)
+
-------------------------------------------------------------------
Thu Jan 10 13:30:41 UTC 2019 - Containers Team
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index 3aeacdf..13f5660 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -1,48 +1,51 @@
-
-
-
+
+
+
+
- SUSE Containers Team
- containers@suse.com
- Etcd running on a openSUSE Kubic container guest
+ Thorsten Kukuk
+ kukuk@suse.com
+ Image containing etcd for openSUSE Kubic.
+ derived_from="obsrepositories:/opensuse/busybox#latest">
+ tag="latest"
+ additionaltags="%PKG_VERSION%,%PKG_VERSION%-%RELEASE%"
+ maintainer="Thorsten Kukuk <kukuk@suse.com>">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ openSUSE Kubic etcd container
- 4.0.1
+ 1.0.0
zypper
- false
- true
true
- en_US
- us.map.gz
- utc
-
-
-
+
+
+
diff --git a/pre_checkin.sh b/pre_checkin.sh
deleted file mode 100644
index d0671c8..0000000
--- a/pre_checkin.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-## pre_checkin.sh script is expected to be called from
-## a local copy of the build service image after running
-## the _services file, e.g. `osc service disabledrun`
-
-log() { echo ">>> $@" ; }
-abort() { log "FATAL: $@" ; exit 1 ; }
-endScript() { log "EXITING: $@" ; exit 0 ; }
-usage() {
- cat < /dev/null
- changes_log=$(git log --pretty=format:"${git_log_format}" \
- ${previous_commit} -- pre_checkin.sh \
- "${image}" | sed "1 s/- \(.*$\)/\1/")
- popd 1> /dev/null
- [ -z "${changes_log}" ] && endScript "Missing new changelog entries"
- osc vc ${changes_file} -m "${changes_log}"
-}
-
-if [ "${namespace}" == "kubic" ]; then
- product='kubic'
- baseimage="opensuse/tumbleweed#latest"
- distro="openSUSE Kubic"
-elif [[ "${namespace}" =~ ^caasp/.* ]]; then
- product='caasp'
- baseimage="suse/sle15#latest"
- distro="SLES15"
-else
- usage
- abort "Unknown product. Product needs to match 'kubic|caasp/.*'"
-fi
-
-set -e
-
-for file in *kiwi.ini; do
- image="${file%%.kiwi.ini}"
- changes_file="${product}-${image}.changes"
- kiwi_file="${product}-${image}.kiwi"
- extra_packages=""
- extra_packages_file="${product}-extra-packages"
-
- # Create a list of extra packages
- if [ -f "${extra_packages_file}" ]; then
- while read -r package; do
- extra_packages+=" \n"
- done < "${extra_packages_file}"
- fi
-
- # update the changes file, mostly used for automation in Concourse CI
- [ -n "${mkchanges}" ] && make_changes_file
-
- # create *.kiwi file from *kiwi.ini template
- cp "${file}" "${kiwi_file}"
- sed -i -e "s@_BASEIMAGE_@${baseimage}@g" \
- -e "s@_DISTRO_@${distro}@g" \
- -e "s@_NAMESPACE_@${namespace}@g" \
- -e "s@_PRODUCT_@${product}@g" \
- -e "/^\n" \
- -e "s@_EXTRA_PACKAGES_@${extra_packages}@g" "${kiwi_file}"
- # Remove blank lines
- sed -i "/^ *$/d" "${kiwi_file}"
- log "${kiwi_file} has been created"
-done
diff --git a/root.obscpio b/root.obscpio
deleted file mode 100644
index 4af04f7..0000000
--- a/root.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3001903532fb915dac046447e24635682ac4abeec8d6d021a0990752cf9e356b
-size 2057