Merge pull request #483 from mythi/sgx-nfd

sgx: make SGX NFD kustomization overlay independent

cmd/sgx_plugin/README.md

@@ -90,14 +90,14 @@ Successfully tagged intel/intel-sgx-initcontainer:devel
 
 #### Deploy the DaemonSet
 
-Deploying the plugin involves the deployment of a
-[NFD EPC Source InitContainer Job](/deployments/sgx_plugin/base/intel-sgx-hookinstall.yaml) the
-[DaemonSet YAML](/deployments/sgx_plugin/base/intel-sgx-plugin.yaml), and node-feature-discovery
+Deploying the plugin involves the deployment of the
+[SGX DaemonSet YAML](/deployments/sgx_plugin/base/intel-sgx-plugin.yaml)
+and [node-feature-discovery](/deployments/sgx_nfd/kustomization.yaml)
 with the necessary configuration.
 
 There is a kustomization for deploying everything:
 ```bash
-$ kubectl apply -k ${INTEL_DEVICE_PLUGINS_SRC}/deployments/sgx_plugin/overlays/nfd
+$ kubectl apply -k ${INTEL_DEVICE_PLUGINS_SRC}/deployments/sgx_plugin/
 ```
 
 #### Verify SGX device plugin is registered on master:

deployments/sgx_nfd/kustomization.yaml

@@ -1,9 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-generatorOptions:
-  disableNameSuffixHash: true
-bases:
-  - ../../base
 resources:
   - nfd-master.yaml
   - nfd-worker-daemonset.yaml

deployments/sgx_plugin/base/kustomization.yaml

@@ -1,2 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+generatorOptions:
+  disableNameSuffixHash: true
+bases:
+  - ../../sgx_nfd
 resources:
   - intel-sgx-plugin.yaml

test/e2e/sgx/sgx.go

@@ -56,7 +56,7 @@ func describe() {
 		}
 		defer os.RemoveAll(tmpDir)
 
-		err = utils.CreateKustomizationOverlay(f.Namespace.Name, filepath.Dir(kustomizationPath)+"/../overlays/nfd", tmpDir)
+		err = utils.CreateKustomizationOverlay(f.Namespace.Name, filepath.Dir(kustomizationPath), tmpDir)
 		if err != nil {
 			framework.Failf("unable to create kustomization overlay: %v", err)
 		}