Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: bump operator-go to 0.12-dev #157

Merged
merged 4 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .chainsaw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ spec:
error: 10s
exec: 45s
# skipDelete: true
parallel: 1
failFast: true
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: |
First, check out our [Collaboration Guide](https://zncdata.dev/docs/developer-manual/collaboration)
First, check out our [Collaboration Guide](https://kubedoop.dev/docs/developer-manual/collaboration)
Please provide a searchable summary of the issue in the title above ⬆️.
- type: dropdown
attributes:
Expand All @@ -27,4 +27,4 @@ body:
- type: textarea
attributes:
label: Motivation 🔦
description: What are you trying to accomplish? How has the lack of this feature affected you? Providing context helps us come up with a solution that is more useful in the real world.
description: What are you trying to accomplish? How has the lack of this feature affected you? Providing context helps us come up with a solution that is more useful in the real world.
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is used to track the info used to scaffold your project
# and allow the plugins properly work.
# More info: https://book.kubebuilder.io/reference/project-config.html
domain: zncdata.dev
domain: kubedoop.dev
layout:
- go.kubebuilder.io/v4
projectName: hive-operator
Expand All @@ -12,7 +12,7 @@ resources:
crdVersion: v1
namespaced: true
controller: true
domain: zncdata.dev
domain: kubedoop.dev
kind: HiveMetastore
path: github.com/zncdatadev/hive-operator/api/v1alpha1
version: v1alpha1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Kubedoop built-in operators:

## Contributing

If you'd like to contribute to Kubedoop, please refer to our [Contributing Guide](https://zncdata.dev/docs/developer-manual/collaboration) for more information.
If you'd like to contribute to Kubedoop, please refer to our [Contributing Guide](https://kubedoop.dev/docs/developer-manual/collaboration) for more information.
We welcome contributions of all kinds, including but not limited to code, documentation, and use cases.

## License
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

// Package v1alpha1 contains API Schema definitions for the v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=zncdata.dev
// +groupName=kubedoop.dev
package v1alpha1

import (
Expand All @@ -26,7 +26,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "zncdata.dev", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "kubedoop.dev", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
46 changes: 5 additions & 41 deletions api/v1alpha1/hivemetastore_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha1
import (
commonsv1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/commons/v1alpha1"
s3v1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/s3/v1alpha1"
corev1 "k8s.io/api/core/v1"
"github.com/zncdatadev/operator-go/pkg/constants"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -77,7 +77,7 @@ type ClusterConfigSpec struct {
// +kubebuilder:validation:Optional
// +kubebuilder:default:=cluster-internal
// +kubebuilder:validation:Enum=cluster-internal;external-unstable;external-stable
ListenerClass string `json:"listenerClass,omitempty"`
ListenerClass constants.ListenerClass `json:"listenerClass,omitempty"`

// +kubebuilder:validation:Optional
HDFS *HDFSSpec `json:"hdfs,omitempty"`
Expand Down Expand Up @@ -153,41 +153,15 @@ type RoleSpec struct {
// +kubebuilder:validation:Optional
RoleConfig *commonsv1alpha1.RoleConfigSpec `json:"roleConfig,omitempty"`

// +kubebuilder:validation:Optional
CliOverrides []string `json:"cliOverrides,omitempty"`

// - hdfs-site.xml
// - core-site.xml
// +kubebuilder:validation:Optional
ConfigOverrides map[string]string `json:"configOverrides,omitempty"`

// +kubebuilder:validation:Optional
EnvOverrides map[string]string `json:"envOverrides,omitempty"`

// +kubebuilder:validation:Optional
// PodOverride *corev1.PodTemplateSpec `json:"podOverride,omitempty"`
*commonsv1alpha1.OverridesSpec `json:",inline"`
}

type ConfigSpec struct {
// +kubebuilder:validation:Optional
Resources *commonsv1alpha1.ResourcesSpec `json:"resources,omitempty"`

// +kubebuilder:validation:Optional
Affinity *corev1.Affinity `json:"affinity"`

// +kubebuilder:validation:Optional
PodDisruptionBudget *commonsv1alpha1.PodDisruptionBudgetSpec `json:"podDisruptionBudget,omitempty"`

// Use time.ParseDuration to parse the string
// +kubebuilder:validation:Optional
GracefulShutdownTimeout *string `json:"gracefulShutdownTimeout,omitempty"`
*commonsv1alpha1.RoleGroupConfigSpec `json:",inline"`

// +kubebuilder:validation:Optional
// +kubebuilder:default:="/kubedoop/warehouse"
WarehouseDir string `json:"warehouseDir,omitempty"`

// +kubebuilder:validation:Optional
Logging *LoggingSpec `json:"logging,omitempty"`
}

type RoleGroupSpec struct {
Expand All @@ -198,17 +172,7 @@ type RoleGroupSpec struct {
// +kubebuilder:validation:Optional
Config *ConfigSpec `json:"config,omitempty"`

// +kubebuilder:validation:Optional
CliOverrides []string `json:"cliOverrides,omitempty"`

// +kubebuilder:validation:Optional
ConfigOverrides map[string]string `json:"configOverrides,omitempty"`

// +kubebuilder:validation:Optional
EnvOverrides map[string]string `json:"envOverrides,omitempty"`

// +kubebuilder:validation:Optional
// PodOverride *corev1.PodTemplateSpec `json:"podOverride,omitempty"`
*commonsv1alpha1.OverridesSpec `json:",inline"`
}

// HiveMetastoreStatus defines the observed state of HiveMetastore
Expand Down
75 changes: 13 additions & 62 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func main() {
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,
WebhookServer: webhookServer,
LeaderElectionID: "d5bf9a68.zncdata.dev",
LeaderElectionID: "d5bf9a68.kubedoop.dev",
// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
// when the Manager ends. This requires the binary to immediately end when the
// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
Expand Down
Loading
Loading