From: Jackie Huang Date: Thu, 31 Oct 2019 02:02:55 +0000 (+0800) Subject: kubernetes-plugins: remove img packages X-Git-Tag: bronze-rc0~123 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=c7e6da046d049a54aa2f83a1435cc4836da447a9;p=pti%2Frtp.git kubernetes-plugins: remove img packages Issue-ID: INF-4 Signed-off-by: Jackie Huang Change-Id: I5327b23a06f0da487bafcd61abae40c0fe7b67da --- diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb index 2803428..a50eb69 100644 --- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb +++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb @@ -52,18 +52,11 @@ RDEPENDS_${PN}-k8s = "\ iproute2-tc \ kubernetes \ kubernetes-dashboard \ + node-feature-discovery \ multus-cni \ cmk \ " -RRECOMMENDS_${PN}-k8s = "\ - flannel-img \ - kubernetes-img \ - kubernetes-dashboard-img \ - multus-cni-img \ - cmk-img \ -" - RDEPENDS_${PN}-vm = "\ qemu \ libvirt \ diff --git a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb b/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb index 58b30bd..1330a17 100644 --- a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb +++ b/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb @@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d62f25248fea71c71fb2b520c72b5171" SRC_URI = "\ https://github.com/intel/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \ - file://docker-img-cmk-v1.3.1.tar.bz2;unpack=0 \ file://cmk-requirements.txt-add-urllib3-1.24.patch \ file://cmk-cluster-init-pod-template.yaml \ " @@ -27,9 +26,6 @@ SRC_URI[sha256sum] = "e86feb81751c6715247577c47070beca273022b470ae09c856e6da72f1 S = "${WORKDIR}/CPU-Manager-for-Kubernetes-${PV}" -PACKAGES =+ "${PN}-img" - -DOCKER_IMG = "/opt/docker_images/${BPN}" K8S_PLUGINS_SRC = "/opt/kubernetes_plugins/${BPN}" K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}" @@ -48,20 +44,14 @@ do_install() { install -m 644 ${S}/resources/authorization/cmk-rbac-rules.yaml ${D}${K8S_PLUGINS} install -m 644 ${WORKDIR}/cmk-cluster-init-pod-template.yaml ${D}${K8S_PLUGINS} - # Install the saved docker image - install -d ${D}${DOCKER_IMG} - install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG} - # Install all the src install -d ${D}${K8S_PLUGINS_SRC} cp -a --no-preserve=ownership ${S}/* ${D}${K8S_PLUGINS_SRC} } FILES_${PN} += "${K8S_PLUGINS_SRC}" -FILES_${PN}-img = "${DOCKER_IMG}" # provides a short alias RPROVIDES_${PN} = "cmk" -RPROVIDES_${PN}-img = "cmk-img" INSANE_SKIP_${PN} = "file-rdeps" diff --git a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb index a6b330b..10283bf 100644 --- a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb +++ b/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb @@ -19,7 +19,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ https://github.com/coreos/flannel/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \ - file://docker-img-flannel-v0.11.0.tar.bz2;unpack=0 \ " SRC_URI[md5sum] = "e023f76c688fd74dce6c0c8df8bea5d7" @@ -27,9 +26,6 @@ SRC_URI[sha256sum] = "476c886ddc06a8afcf54e181ac55579224c6be424089567a0b8d9e93dd S = "${WORKDIR}/${BPN}-${PV}" -PACKAGES =+ "${PN}-img" - -DOCKER_IMG = "/opt/docker_images/${BPN}" K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}" do_install() { @@ -37,10 +33,4 @@ do_install() { install -m 644 ${S}/README.md ${D}${K8S_PLUGINS} install -m 644 ${S}/Documentation/kube-flannel.yml ${D}${K8S_PLUGINS} sed -i -e 's/v0.10.0/v0.11.0/' ${D}${K8S_PLUGINS}/kube-flannel.yml - - # Install the saved docker image - install -d ${D}${DOCKER_IMG} - install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG} } - -FILES_${PN}-img = "${DOCKER_IMG}" diff --git a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb b/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb index 6cf7211..b7fe077 100644 --- a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb +++ b/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb @@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3" SRC_URI = "\ https://github.com/kubernetes/dashboard/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \ - file://docker-img-kubernetes-dashboard-v1.8.3.tar.bz2;unpack=0 \ file://kubernetes-dashboard-admin.rbac.yaml \ file://kubernetes-dashboard.yaml-set-the-NodePort-type.patch \ " @@ -26,9 +25,6 @@ SRC_URI[sha256sum] = "9096f86d4107a6d23f2cff5edd1acae2faf25719a343c319860fd6a740 S = "${WORKDIR}/dashboard-${PV}" -PACKAGES =+ "${PN}-img" - -DOCKER_IMG = "/opt/docker_images/${BPN}" K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}" do_install() { @@ -36,10 +32,4 @@ do_install() { install -m 644 ${WORKDIR}/kubernetes-dashboard-admin.rbac.yaml ${D}${K8S_PLUGINS} install -m 644 ${S}/src/deploy/recommended/kubernetes-dashboard.yaml ${D}${K8S_PLUGINS} install -m 644 ${S}/README.md ${D}${K8S_PLUGINS} - - # Install the saved docker image - install -d ${D}${DOCKER_IMG} - install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG} } - -FILES_${PN}-img = "${DOCKER_IMG}" diff --git a/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb b/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb index 0ec9d6a..f6b6dba 100644 --- a/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb +++ b/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb @@ -18,7 +18,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI = "\ https://github.com/intel/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \ - file://docker-img-multus-v3.2.tar.bz2;unpack=0 \ " SRC_URI[md5sum] = "fa75272319b19a6192f9d607b79829ea" @@ -26,9 +25,6 @@ SRC_URI[sha256sum] = "9544fca58e6d1f3943159086651ceb228242b5fd85688bd424d7504c19 S = "${WORKDIR}/${BPN}-${PV}" -PACKAGES =+ "${PN}-img" - -DOCKER_IMG = "/opt/docker_images/${BPN}" K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}" do_install() { @@ -37,10 +33,4 @@ do_install() { install -m 644 ${S}/images/entrypoint.sh ${D}${K8S_PLUGINS} install -m 644 ${S}/images/README.md ${D}${K8S_PLUGINS}/README-deployment.md install -m 644 ${S}/images/multus-daemonset-pre-1.16.yml ${D}${K8S_PLUGINS}/multus-daemonset.yml - - # Install the saved docker image - install -d ${D}${DOCKER_IMG} - install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG} } - -FILES_${PN}-img = "${DOCKER_IMG}" diff --git a/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb index 129a340..cdc7939 100644 --- a/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb +++ b/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb @@ -21,7 +21,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa" SRC_URI = "\ https://github.com/kubernetes-sigs/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \ - file://docker-img-nfd-v0.4.0.tar.bz2;unpack=0 \ " SRC_URI[md5sum] = "16bcac1d904351a88faa5c6752420ce5" @@ -29,11 +28,16 @@ SRC_URI[sha256sum] = "c9f826e6c7a42161befc155ca0f465ac5667903e74c857e978a99c7457 S = "${WORKDIR}/${BPN}-${PV}" -PACKAGES =+ "${PN}-img" - -DOCKER_IMG = "/opt/docker_images/${BPN}" K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}" +do_configure() { + : +} + +do_compile() { + : +} + do_install() { install -d ${D}${K8S_PLUGINS} install -m 644 ${S}/README.md ${D}${K8S_PLUGINS} @@ -42,10 +46,4 @@ do_install() { install -m 644 ${S}/nfd-worker-job.yaml.template ${D}${K8S_PLUGINS} install -m 644 ${S}/nfd-master.yaml.template ${D}${K8S_PLUGINS}/nfd-master.yaml install -m 644 ${S}/nfd-worker-daemonset.yaml.template ${D}${K8S_PLUGINS}/nfd-worker-daemonset.yaml - - # Install the saved docker image - install -d ${D}${DOCKER_IMG} - install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG} } - -FILES_${PN}-img = "${DOCKER_IMG}" diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb index c2d8438..ffc6491 100644 --- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb +++ b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb @@ -8,33 +8,14 @@ PV = "1.15.2+git${SRCREV_kubernetes}" SRCREV_kubernetes = "f6278300bebbb750328ac16ee6dd3aa7d3549568" SRC_BRANCH = "release-1.15" -# The docker images included in docker-img-kubernetes-v1.15.2.tar.bz2: -# k8s.gcr.io/kube-scheduler v1.15.2 88fa9cb27bd2 2 months ago 81.1MB -# k8s.gcr.io/kube-proxy v1.15.2 167bbf6c9338 2 months ago 82.4MB -# k8s.gcr.io/kube-controller-manager v1.15.2 9f5df470155d 2 months ago 159MB -# k8s.gcr.io/kube-apiserver v1.15.2 34a53be6c9a7 2 months ago 207MB -# k8s.gcr.io/coredns 1.3.1 eb516548c180 9 months ago 40.3MB -# k8s.gcr.io/etcd 3.3.10 2c4adeb21b4f 10 months ago 258MB - SRC_URI += "\ file://k8s.conf \ - file://docker-img-kubernetes-v1.15.2.tar.bz2;unpack=0 \ " inherit go112 -PACKAGES =+ "${PN}-img" - -DOCKER_IMG = "/opt/docker_images/${BPN}" - do_install_append() { - # Install the saved docker image - install -d ${D}${DOCKER_IMG} - install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG} - # Install the sysctl config for k8s install -d ${D}${sysconfdir}/sysctl.d/ install -m 644 -D ${WORKDIR}/k8s.conf ${D}${sysconfdir}/sysctl.d/ } - -FILES_${PN}-img = "${DOCKER_IMG}"