Repository: kubernetes/minikube
Pull request #8548 (2020-06-24 18:44:08)

Rename falco-probe package to falco-module instead
Same software, but upstream changed the packaging.

As hinted by https://github.com/falcosecurity/falco/issues/1276


Patch:
diff --git a/deploy/addons/dashboard/dashboard-dp.yaml b/deploy/addons/dashboard/dashboard-dp.yaml
index aec28edf6..fae011b40 100644
--- a/deploy/addons/dashboard/dashboard-dp.yaml
+++ b/deploy/addons/dashboard/dashboard-dp.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
         - name: dashboard-metrics-scraper
-          image: kubernetesui/metrics-scraper:v1.0.4
+          image: kubernetesui/metrics-scraper:v1.0.2
           ports:
             - containerPort: 8000
               protocol: TCP
@@ -73,7 +73,7 @@ metadata:
   labels:
     k8s-app: kubernetes-dashboard
     kubernetes.io/minikube-addons: dashboard
-    addonmanager.kubernetes.io/mode: Reconcile
+    addonmanager.kubernetes.io/mode: Reconcile    
   name: kubernetes-dashboard
   namespace: kubernetes-dashboard
 spec:
@@ -90,7 +90,7 @@ spec:
       containers:
         - name: kubernetes-dashboard
           # WARNING: This must match pkg/minikube/bootstrapper/images/images.go
-          image: kubernetesui/dashboard:v2.0.1
+          image: kubernetesui/dashboard:v2.0.0
           ports:
             - containerPort: 9090
               protocol: TCP
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
index 723e2f42b..dc7a8c85c 100644
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@@ -13,5 +13,5 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/containerd-bin/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-probe/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
 endmenu
diff --git a/deploy/iso/minikube-iso/package/falco-probe/Config.in b/deploy/iso/minikube-iso/package/falco-module/Config.in
similarity index 64%
rename from deploy/iso/minikube-iso/package/falco-probe/Config.in
rename to deploy/iso/minikube-iso/package/falco-module/Config.in
index b8e8b8036..ad271f426 100644
--- a/deploy/iso/minikube-iso/package/falco-probe/Config.in
+++ b/deploy/iso/minikube-iso/package/falco-module/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_FALCO_PROBE
-	bool "falco-probe"
+config BR2_PACKAGE_FALCO_MODULE
+	bool "falco-module"
 	default y
 	depends on BR2_LINUX_KERNEL
 	select BR2_PACKAGE_NCURSES
diff --git a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/falco-probe/falco-probe.hash
rename to deploy/iso/minikube-iso/package/falco-module/falco-module.hash
diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk
new file mode 100644
index 000000000..18ecf90c6
--- /dev/null
+++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk
@@ -0,0 +1,34 @@
+########################################################################
+#
+# Falco driver kernel module
+#
+########################################################################
+
+FALCO_MODULE_VERSION = 0.23.0
+FALCO_MODULE_SITE = https://github.com/falcosecurity/falco/archive
+FALCO_MODULE_SOURCE = $(FALCO_MODULE_VERSION).tar.gz
+FALCO_MODULE_DEPENDENCIES += ncurses libyaml
+FALCO_MODULE_LICENSE = Apache-2.0
+FALCO_MODULE_LICENSE_FILES = COPYING
+
+# see cmake/modules/sysdig-repo/CMakeLists.txt
+FALCO_MODULE_SYSDIG_VERSION = 96bd9bc560f67742738eb7255aeb4d03046b8045
+FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/draios/sysdig/archive/${FALCO_MODULE_SYSDIG_VERSION}.tar.gz
+
+define FALCO_MODULE_SYSDIG_SRC
+	sed -e 's|URL ".*"|URL "'$(FALCO_MODULE_DL_DIR)/$(FALCO_MODULE_SYSDIG_VERSION).tar.gz'"|' -i $(@D)/cmake/modules/sysdig-repo/CMakeLists.txt
+endef
+
+FALCO_MODULE_POST_EXTRACT_HOOKS += FALCO_MODULE_SYSDIG_SRC
+
+FALCO_MODULE_CONF_OPTS = -DFALCO_VERSION=$(FALCO_MODULE_VERSION)
+FALCO_MODULE_CONF_OPTS += -DUSE_BUNDLED_DEPS=ON
+
+FALCO_MODULE_MAKE_ENV = $(LINUX_MAKE_ENV)
+FALCO_MODULE_MAKE_OPTS = $(LINUX_MAKE_FLAGS) driver KERNELDIR=$(LINUX_DIR)
+FALCO_MODULE_INSTALL_OPTS = install_driver
+FALCO_MODULE_INSTALL_STAGING_OPTS = INSTALL_MOD_PATH=$(STAGING_DIR) install_driver
+FALCO_MODULE_INSTALL_TARGET_OPTS = INSTALL_MOD_PATH=$(TARGET_DIR) install_driver
+
+$(eval $(kernel-module))
+$(eval $(cmake-package))
diff --git a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk b/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk
deleted file mode 100644
index 338913b60..000000000
--- a/deploy/iso/minikube-iso/package/falco-probe/falco-probe.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-########################################################################
-#
-# Falco probe (driver) kernel module
-#
-########################################################################
-
-FALCO_PROBE_VERSION = 0.23.0
-FALCO_PROBE_SITE = https://github.com/falcosecurity/falco/archive
-FALCO_PROBE_SOURCE = $(FALCO_PROBE_VERSION).tar.gz
-FALCO_PROBE_DEPENDENCIES += ncurses libyaml
-FALCO_PROBE_LICENSE = Apache-2.0
-FALCO_PROBE_LICENSE_FILES = COPYING
-
-# see cmake/modules/sysdig-repo/CMakeLists.txt
-FALCO_PROBE_SYSDIG_VERSION = 96bd9bc560f67742738eb7255aeb4d03046b8045
-FALCO_PROBE_EXTRA_DOWNLOADS = https://github.com/draios/sysdig/archive/${FALCO_PROBE_SYSDIG_VERSION}.tar.gz
-
-define FALCO_PROBE_SYSDIG_SRC
-	sed -e 's|URL ".*"|URL "'$(FALCO_PROBE_DL_DIR)/$(FALCO_PROBE_SYSDIG_VERSION).tar.gz'"|' -i $(@D)/cmake/modules/sysdig-repo/CMakeLists.txt
-endef
-
-FALCO_PROBE_POST_EXTRACT_HOOKS += FALCO_PROBE_SYSDIG_SRC
-
-FALCO_PROBE_CONF_OPTS = -DFALCO_VERSION=$(FALCO_PROBE_VERSION)
-FALCO_PROBE_CONF_OPTS += -DUSE_BUNDLED_DEPS=ON
-
-FALCO_PROBE_MAKE_ENV = $(LINUX_MAKE_ENV)
-FALCO_PROBE_MAKE_OPTS = $(LINUX_MAKE_FLAGS) driver KERNELDIR=$(LINUX_DIR)
-FALCO_PROBE_INSTALL_OPTS = install_driver
-FALCO_PROBE_INSTALL_STAGING_OPTS = INSTALL_MOD_PATH=$(STAGING_DIR) install_driver
-FALCO_PROBE_INSTALL_TARGET_OPTS = INSTALL_MOD_PATH=$(TARGET_DIR) install_driver
-
-$(eval $(kernel-module))
-$(eval $(cmake-package))
diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go
index 07f74afc0..addc83baa 100644
--- a/pkg/minikube/bootstrapper/images/images.go
+++ b/pkg/minikube/bootstrapper/images/images.go
@@ -135,7 +135,7 @@ func dashboardFrontend(repo string) string {
 		repo = "kubernetesui"
 	}
 	// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
-	return path.Join(repo, "dashboard:v2.0.1")
+	return path.Join(repo, "dashboard:v2.0.0")
 }
 
 // dashboardMetrics returns the image used for the dashboard metrics scraper
@@ -144,5 +144,5 @@ func dashboardMetrics(repo string) string {
 		repo = "kubernetesui"
 	}
 	// See 'dashboard-metrics-scraper' in deploy/addons/dashboard/dashboard-dp.yaml
-	return path.Join(repo, "metrics-scraper:v1.0.4")
+	return path.Join(repo, "metrics-scraper:v1.0.2")
 }
diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
index cf8b97d94..2d9a0a913 100644
--- a/pkg/minikube/download/preload.go
+++ b/pkg/minikube/download/preload.go
@@ -40,7 +40,7 @@ const (
 	// PreloadVersion is the current version of the preloaded tarball
 	//
 	// NOTE: You may need to bump this version up when upgrading auxiliary docker images
-	PreloadVersion = "v4"
+	PreloadVersion = "v3"
 	// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
 	PreloadBucket = "minikube-preloaded-volume-tarballs"
 )


Test patch:
diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go
index 657d43a51..ff5de65c4 100644
--- a/pkg/minikube/bootstrapper/images/images_test.go
+++ b/pkg/minikube/bootstrapper/images/images_test.go
@@ -25,8 +25,8 @@ import (
 func TestAuxiliary(t *testing.T) {
 	want := []string{
 		"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-		"kubernetesui/dashboard:v2.0.1",
-		"kubernetesui/metrics-scraper:v1.0.4",
+		"kubernetesui/dashboard:v2.0.0",
+		"kubernetesui/metrics-scraper:v1.0.2",
 	}
 	got := auxiliary("")
 	if diff := cmp.Diff(want, got); diff != "" {
@@ -37,8 +37,8 @@ func TestAuxiliary(t *testing.T) {
 func TestAuxiliaryMirror(t *testing.T) {
 	want := []string{
 		"test.mirror/storage-provisioner:v1.8.1",
-		"test.mirror/dashboard:v2.0.1",
-		"test.mirror/metrics-scraper:v1.0.4",
+		"test.mirror/dashboard:v2.0.0",
+		"test.mirror/metrics-scraper:v1.0.2",
 	}
 	got := auxiliary("test.mirror")
 	if diff := cmp.Diff(want, got); diff != "" {
diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go
index d95ca2fd4..169d68d49 100644
--- a/pkg/minikube/bootstrapper/images/kubeadm_test.go
+++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go
@@ -38,8 +38,8 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.4.3-0",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.1",
-			"kubernetesui/metrics-scraper:v1.0.4",
+			"kubernetesui/dashboard:v2.0.0",
+			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.16.1", "mirror.k8s.io", []string{
 			"mirror.k8s.io/kube-proxy:v1.16.1",
@@ -50,8 +50,8 @@ func TestKubeadmImages(t *testing.T) {
 			"mirror.k8s.io/etcd:3.3.15-0",
 			"mirror.k8s.io/pause:3.1",
 			"mirror.k8s.io/storage-provisioner:v1.8.1",
-			"mirror.k8s.io/dashboard:v2.0.1",
-			"mirror.k8s.io/metrics-scraper:v1.0.4",
+			"mirror.k8s.io/dashboard:v2.0.0",
+			"mirror.k8s.io/metrics-scraper:v1.0.2",
 		}},
 		{"v1.15.0", "", []string{
 			"k8s.gcr.io/kube-proxy:v1.15.0",
@@ -62,8 +62,8 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.3.10",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.1",
-			"kubernetesui/metrics-scraper:v1.0.4",
+			"kubernetesui/dashboard:v2.0.0",
+			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.14.0", "", []string{
 			"k8s.gcr.io/kube-proxy:v1.14.0",
@@ -74,8 +74,8 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.3.10",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.1",
-			"kubernetesui/metrics-scraper:v1.0.4",
+			"kubernetesui/dashboard:v2.0.0",
+			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.13.0", "", []string{
 			"k8s.gcr.io/kube-proxy:v1.13.0",
@@ -86,8 +86,8 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.2.24",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.1",
-			"kubernetesui/metrics-scraper:v1.0.4",
+			"kubernetesui/dashboard:v2.0.0",
+			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 		{"v1.12.0", "", []string{
 			"k8s.gcr.io/kube-proxy:v1.12.0",
@@ -98,8 +98,8 @@ func TestKubeadmImages(t *testing.T) {
 			"k8s.gcr.io/etcd:3.2.24",
 			"k8s.gcr.io/pause:3.1",
 			"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
-			"kubernetesui/dashboard:v2.0.1",
-			"kubernetesui/metrics-scraper:v1.0.4",
+			"kubernetesui/dashboard:v2.0.0",
+			"kubernetesui/metrics-scraper:v1.0.2",
 		}},
 	}
 	for _, tc := range tests {
diff --git a/pkg/minikube/cruntime/containerd_test.go b/pkg/minikube/cruntime/containerd_test.go
index 5f99033da..cfb1e55f6 100644
--- a/pkg/minikube/cruntime/containerd_test.go
+++ b/pkg/minikube/cruntime/containerd_test.go
@@ -25,8 +25,8 @@ func TestAddRepoTagToImageName(t *testing.T) {
 		imgName string
 		want    string
 	}{
-		{"kubernetesui/dashboard:v2.0.1", "docker.io/kubernetesui/dashboard:v2.0.1"},
-		{"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"},
+		{"kubernetesui/dashboard:v2.0.0-rc6", "docker.io/kubernetesui/dashboard:v2.0.0-rc6"},
+		{"kubernetesui/metrics-scraper:v1.0.2", "docker.io/kubernetesui/metrics-scraper:v1.0.2"},
 		{"gcr.io/k8s-minikube/storage-provisioner:v1.8.1", "gcr.io/k8s-minikube/storage-provisioner:v1.8.1"},
 	}
 	for _, tc := range tests {