Merge pull request #190 from sunya-ch/v1.3.0

make details of hostinterface optional and set default container

api/v1/hostinterface_types.go

@@ -9,16 +9,13 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// 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.
-
 type InterfaceInfoType struct {
 	InterfaceName string `json:"interfaceName"`
-	NetAddress    string `json:"netAddress"`
-	HostIP        string `json:"hostIP"`
-	Vendor        string `json:"vendor"`
-	Product       string `json:"product"`
-	PciAddress    string `json:"pciAddress"`
+	NetAddress    string `json:"netAddress,omitempty"`
+	HostIP        string `json:"hostIP,omitempty"`
+	Vendor        string `json:"vendor,omitempty"`
+	Product       string `json:"product,omitempty"`
+	PciAddress    string `json:"pciAddress,omitempty"`
 }
 
 func (i InterfaceInfoType) Equal(cmp InterfaceInfoType) bool {

bundle.Dockerfile

@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=multi-nic-cni-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

config/crd/bases/multinic.fms.io_hostinterfaces.yaml

@@ -54,12 +54,7 @@ spec:
                     vendor:
                       type: string
                   required:
-                  - hostIP
                   - interfaceName
-                  - netAddress
-                  - pciAddress
-                  - product
-                  - vendor
                   type: object
                 type: array
             required:

config/manager/manager.yaml

@@ -19,6 +19,8 @@ spec:
   replicas: 1
   template:
     metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: manager
       labels:
         control-plane: controller-manager
     spec:

config/manifests/bases/multi-nic-cni-operator.clusterserviceversion.template

@@ -7,7 +7,7 @@ metadata:
     categories: Networking
     containerImage: ${IMG}
     repository: http://github.com/foundation-model-stack/multi-nic-cni
-    support: IBM
+    support: Foundation Model Stack Team
     description: Automate container multi-network configuration
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
@@ -138,6 +138,7 @@ spec:
   - email: [email protected]
     name: Tatsuhiro Chiba
   maturity: alpha
+  minKubeVersion: 1.25.0
   provider:
     name: Foundation Model Stack
   version: 0.0.0