move v1alpha2 to v1veta1 api version and group to banzaicloud.io

xinjixi · Sep 21, 2019 · 8270891 · 8270891
1 parent f0cd514
commit 8270891
Show file tree

Hide file tree

Showing 37 changed files with 297 additions and 158 deletions.
diff --git a/PROJECT b/PROJECT
@@ -1,25 +1,25 @@
 version: "2"
-domain: banzaicloud.com
+domain: banzaicloud.io
 repo: github.com/banzaicloud/logging-operator
 resources:
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: Fluentbit
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: Fluentd
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: Flow
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: ClusterFlow
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: Output
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: ClusterOutput
 - group: logging
-  version: v1alpha2
+  version: v1beta1
   kind: Logging
diff --git a/api/v1alpha2/clusterflow_types.go → api/v1beta1/clusterflow_types.go b/api/v1alpha2/clusterflow_types.go → api/v1beta1/clusterflow_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1alpha2/clusterflow_types_test.go → api/v1beta1/clusterflow_types_test.go b/api/v1alpha2/clusterflow_types_test.go → api/v1beta1/clusterflow_types_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/clusteroutput_types.go → api/v1beta1/clusteroutput_types.go b/api/v1alpha2/clusteroutput_types.go → api/v1beta1/clusteroutput_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/v1alpha2/clusteroutput_types_test.go → api/v1beta1/clusteroutput_types_test.go b/api/v1alpha2/clusteroutput_types_test.go → api/v1beta1/clusteroutput_types_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/common_types.go → api/v1beta1/common_types.go b/api/v1alpha2/common_types.go → api/v1beta1/common_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 // ImageSpec struct hold information about image specification
 type ImageSpec struct {

diff --git a/api/v1alpha2/flow_types.go → api/v1beta1/flow_types.go b/api/v1alpha2/flow_types.go → api/v1beta1/flow_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"github.com/banzaicloud/logging-operator/pkg/model/filter"

diff --git a/api/v1alpha2/flow_types_test.go → api/v1beta1/flow_types_test.go b/api/v1alpha2/flow_types_test.go → api/v1beta1/flow_types_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/fluentbit_types.go → api/v1beta1/fluentbit_types.go b/api/v1alpha2/fluentbit_types.go → api/v1beta1/fluentbit_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"strconv"

diff --git a/api/v1alpha2/fluentd_types.go → api/v1beta1/fluentd_types.go b/api/v1alpha2/fluentd_types.go → api/v1beta1/fluentd_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"strconv"

diff --git a/api/v1alpha2/groupversion_info.go → api/v1beta1/groupversion_info.go b/api/v1alpha2/groupversion_info.go → api/v1beta1/groupversion_info.go
@@ -14,8 +14,8 @@
 
 // Package v1alpha2 contains API Schema definitions for the logging v1alpha2 API group
 // +kubebuilder:object:generate=true
-// +groupName=logging.banzaicloud.com
-package v1alpha2
+// +groupName=logging.banzaicloud.io
+package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -24,7 +24,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "logging.banzaicloud.com", Version: "v1alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "logging.banzaicloud.io", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1alpha2/logging_types.go → api/v1beta1/logging_types.go b/api/v1alpha2/logging_types.go → api/v1beta1/logging_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"

diff --git a/api/v1alpha2/output_types.go → api/v1beta1/output_types.go b/api/v1alpha2/output_types.go → api/v1beta1/output_types.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"github.com/banzaicloud/logging-operator/pkg/model/output"

diff --git a/api/v1alpha2/output_types_test.go → api/v1beta1/output_types_test.go b/api/v1alpha2/output_types_test.go → api/v1beta1/output_types_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/suite_test.go → api/v1beta1/suite_test.go b/api/v1alpha2/suite_test.go → api/v1beta1/suite_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha2
+package v1beta1
 
 import (
 	"path/filepath"

diff --git a/api/v1alpha2/zz_generated.deepcopy.go → api/v1beta1/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go → api/v1beta1/zz_generated.deepcopy.go
diff --git a/...logging.banzaicloud.com_clusterflows.yaml → .../logging.banzaicloud.io_clusterflows.yaml b/...logging.banzaicloud.com_clusterflows.yaml → .../logging.banzaicloud.io_clusterflows.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: clusterflows.logging.banzaicloud.com
+  name: clusterflows.logging.banzaicloud.io
 spec:
-  group: logging.banzaicloud.com
+  group: logging.banzaicloud.io
   names:
     kind: ClusterFlow
     listKind: ClusterFlowList
@@ -127,9 +127,9 @@ spec:
           description: FlowStatus defines the observed state of Flow
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
   versions:
-  - name: v1alpha2
+  - name: v1beta1
     served: true
     storage: true
 status:

diff --git a/...gging.banzaicloud.com_clusteroutputs.yaml → ...ogging.banzaicloud.io_clusteroutputs.yaml b/...gging.banzaicloud.com_clusteroutputs.yaml → ...ogging.banzaicloud.io_clusteroutputs.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: clusteroutputs.logging.banzaicloud.com
+  name: clusteroutputs.logging.banzaicloud.io
 spec:
-  group: logging.banzaicloud.com
+  group: logging.banzaicloud.io
   names:
     kind: ClusterOutput
     listKind: ClusterOutputList
@@ -2261,9 +2261,9 @@ spec:
       required:
       - spec
       type: object
-  version: v1alpha2
+  version: v1beta1
   versions:
-  - name: v1alpha2
+  - name: v1beta1
     served: true
     storage: true
 status:

diff --git a/...plates/logging.banzaicloud.com_flows.yaml → ...mplates/logging.banzaicloud.io_flows.yaml b/...plates/logging.banzaicloud.com_flows.yaml → ...mplates/logging.banzaicloud.io_flows.yaml
@@ -4,13 +4,13 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: flows.logging.banzaicloud.com
+  name: flows.logging.banzaicloud.io
 spec:
   additionalPrinterColumns:
   - JSONPath: .spec.loggingRef
     name: Logging
     type: string
-  group: logging.banzaicloud.com
+  group: logging.banzaicloud.io
   names:
     kind: Flow
     listKind: FlowList
@@ -132,9 +132,9 @@ spec:
           description: FlowStatus defines the observed state of Flow
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
   versions:
-  - name: v1alpha2
+  - name: v1beta1
     served: true
     storage: true
 status:

diff --git a/...ses/logging.banzaicloud.com_loggings.yaml → ...ates/logging.banzaicloud.io_loggings.yaml b/...ses/logging.banzaicloud.com_loggings.yaml → ...ates/logging.banzaicloud.io_loggings.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: loggings.logging.banzaicloud.com
+  name: loggings.logging.banzaicloud.io
 spec:
-  group: logging.banzaicloud.com
+  group: logging.banzaicloud.io
   names:
     kind: Logging
     listKind: LoggingList
@@ -292,6 +292,10 @@ spec:
                   - repository
                   - tag
                   type: object
+                nodeSelector:
+                  additionalProperties:
+                    type: string
+                  type: object
                 port:
                   format: int32
                   type: integer
@@ -327,6 +331,45 @@ spec:
                   - enabled
                   - secretName
                   type: object
+                tolerations:
+                  items:
+                    description: The pod this Toleration is attached to tolerates
+                      any taint that matches the triple <key,value,effect> using the
+                      matching operator <operator>.
+                    properties:
+                      effect:
+                        description: Effect indicates the taint effect to match. Empty
+                          means match all taint effects. When specified, allowed values
+                          are NoSchedule, PreferNoSchedule and NoExecute.
+                        type: string
+                      key:
+                        description: Key is the taint key that the toleration applies
+                          to. Empty means match all taint keys. If the key is empty,
+                          operator must be Exists; this combination means to match
+                          all values and all keys.
+                        type: string
+                      operator:
+                        description: Operator represents a key's relationship to the
+                          value. Valid operators are Exists and Equal. Defaults to
+                          Equal. Exists is equivalent to wildcard for value, so that
+                          a pod can tolerate all taints of a particular category.
+                        type: string
+                      tolerationSeconds:
+                        description: TolerationSeconds represents the period of time
+                          the toleration (which must be of effect NoExecute, otherwise
+                          this field is ignored) tolerates the taint. By default,
+                          it is not set, which means tolerate the taint forever (do
+                          not evict). Zero and negative values will be treated as
+                          0 (evict immediately) by the system.
+                        format: int64
+                        type: integer
+                      value:
+                        description: Value is the taint value the toleration matches
+                          to. If the operator is Exists, the value should be empty,
+                          otherwise just a regular string.
+                        type: string
+                    type: object
+                  type: array
                 volumeModImage:
                   description: ImageSpec struct hold information about image specification
                   properties:
@@ -360,9 +403,9 @@ spec:
               type: object
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
   versions:
-  - name: v1alpha2
+  - name: v1beta1
     served: true
     storage: true
 status:

diff --git a/...ates/logging.banzaicloud.com_outputs.yaml → ...lates/logging.banzaicloud.io_outputs.yaml b/...ates/logging.banzaicloud.com_outputs.yaml → ...lates/logging.banzaicloud.io_outputs.yaml
@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: outputs.logging.banzaicloud.com
+  name: outputs.logging.banzaicloud.io
 spec:
-  group: logging.banzaicloud.com
+  group: logging.banzaicloud.io
   names:
     kind: Output
     listKind: OutputList
@@ -2255,9 +2255,9 @@ spec:
           description: OutputStatus defines the observed state of Output
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
   versions:
-  - name: v1alpha2
+  - name: v1beta1
     served: true
     storage: true
 status: