Combine skydive analyzer and skydive agents into skydive suite.

Add script for openshift easy deploy.
Fix kube config path error.
Delete redundant logs messages.

Author: orannahoum

.idea/modules.xml

@@ -7,4 +7,7 @@ resources:
 - group: skydive
   kind: SkydiveAnalyzer
   version: v1beta1
+- group: skydive
+  kind: SkydiveSuite
+  version: v1
 version: "2"

.idea/skydive-golang-operator.iml

@@ -16,36 +16,21 @@ To set up this operator follow the instructions below:
   darwin/amd64
 
 * An openshift cluster
-    * If you don't have an openshift cluster you may locally install one
-      using [kind](https://kind.sigs.k8s.io/docs/user/quick-start/)
 
-### Installation
 
-1. If you're running a kind cluster the following commands won't work for you and you will have to modify the project
-   namespace in the next part
+### Modyfing the CRD
+Modify the file config/skydive_v1_skydivesuite.yaml and pick what you wish to deploy (insert true or false in the relevant field), the options are as follows:
+* Skydive agents
+* Skydive analyzer
+    * Service route - TODO: doesn't work on IBM cluster.   
+    
+Choose your logging level (defaults to INFO)
 
-```zsh
-oc adm new-project --node-selector='' skydive
-oc project skydive
-```
 
-2. Run this to grant privileges to your user (#TODO this is maybe not needed)
+### Installation - Open-Shift
 
-```zsh
-oc adm policy add-scc-to-user privileged -z default
-oc adm policy add-cluster-role-to-user cluster-reader -z default
-```
+run the zsh script :
+    ```deploy_operator_on_openshift.sh```
 
-3. Clone this repo into your $GOPATH/src folder
-4. From skydive-operator folder run:
-
-```bash
-make manifests
-kubectl create -f config/crd/bases
-kubectl create -f config/samples/skydive_v1beta1_skydiveanalyzer.yaml 
-kubectl create -f config/samples/skydive_v1beta1_skydiveagents.yaml 
-make run
-```
-
-You might need to install some golang packages 
-(#TODO make sure to see what my IDE auto installed for me)
+### Installation - Kubernetes
+*** to be continued

.idea/vcs.xml

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1beta1 contains API Schema definitions for the skydive v1beta1 API group
+// Package v1 contains API Schema definitions for the skydive v1 API group
 // +kubebuilder:object:generate=true
 // +groupName=skydive.example.com
-package v1beta1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "skydive.example.com", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: "skydive.example.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

PROJECT

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -23,43 +23,61 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-// SkydiveAnalyzerSpec defines the desired state of SkydiveAnalyzer
-type SkydiveAnalyzerSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+// SkydiveSuiteSpec defines the desired state of SkydiveSuite
+type SkydiveSuiteSpec struct {
+	Namespace string `json:"namespace,omitempty"`
+
+	Enable EnableSpec `json:"enable"`
+
+	Logging LoggingSpec `json:"logging"`
+}
+
+type EnableSpec struct {
+	// +optional
+	// +kubebuilder:default=true
+	Analyzer bool `json:"analyzer,omitempty"`
+
+	// +optional
+	// +kubebuilder:default=true
+	Agents bool `json:"agents,omitempty"`
+
+	// +optional
+	// +kubebuilder:default=false
+	Route bool `json:"route,omitempty"`
+}
 
+type LoggingSpec struct {
 	// +optional
-	// +kubebuilder:default=1
-	Replicas *int32 `json:"replicas,omitempty"`
+	// +kubebuilder:default="INFO"
+	Level string `json:"level,omitempty"`
 }
 
-// SkydiveAnalyzerStatus defines the observed state of SkydiveAnalyzer
-type SkydiveAnalyzerStatus struct {
+// SkydiveSuiteStatus defines the observed state of SkydiveSuite
+type SkydiveSuiteStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
 
-// SkydiveAnalyzer is the Schema for the skydiveanalyzers API
-type SkydiveAnalyzer struct {
+// SkydiveSuite is the Schema for the skydivesuites API
+type SkydiveSuite struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   SkydiveAnalyzerSpec   `json:"spec,omitempty"`
-	Status SkydiveAnalyzerStatus `json:"status,omitempty"`
+	Spec   SkydiveSuiteSpec   `json:"spec,omitempty"`
+	Status SkydiveSuiteStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// SkydiveAnalyzerList contains a list of SkydiveAnalyzer
-type SkydiveAnalyzerList struct {
+// SkydiveSuiteList contains a list of SkydiveSuite
+type SkydiveSuiteList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []SkydiveAnalyzer `json:"items"`
+	Items           []SkydiveSuite `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&SkydiveAnalyzer{}, &SkydiveAnalyzerList{})
+	SchemeBuilder.Register(&SkydiveSuite{}, &SkydiveSuiteList{})
 }