Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
feat: drop etcd support
Browse files Browse the repository at this point in the history
  • Loading branch information
paddatrapper committed Oct 12, 2022
1 parent 4a4e406 commit 67f4b1a
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 307 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* **Monitoring** ([Grafana](https://github.com/integr8ly/grafana-operator), [Prometheus](https://github.com/coreos/prometheus-operator), [Thanos](https://thanos.io/), [Karma](https://github.com/prymitive/karma), [Canary Checker](https://github.com/flanksource/canary-checker))
* **Multi-Tenancy** ([Namespace Configurator](https://github.com/redhat-cop/namespace-configuration-operator) Cluster Quotas, [Kiosk](https://github.com/kiosk-sh/kiosk))
* **Cluster Provisioning** framework for [Kind](https://karina.docs.flanksource.com/admin-guide/provisioning/kind/), [vSphere](https://karina.docs.flanksource.com/admin-guide/provisioning/vsphere/) and Cluster API (Coming Soon)
* **Operations focused CLI** for health checks, etcd maintenance, backup and restore, rolling updates, logging, etc..
* **Operations focused CLI** for health checks, backup and restore, rolling updates, logging, etc..

karina leverages a number of other standalone operators built by flanksource:

Expand Down
1 change: 0 additions & 1 deletion cmd/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ func TestGetConfigSetDefaults(t *testing.T) {
ControllerExtraArgs: map[string]string{},
SchedulerExtraArgs: map[string]string{},
KubeletExtraArgs: map[string]string{},
EtcdExtraArgs: map[string]string{},
ContainerRuntime: "docker",
}))
}
Expand Down
59 changes: 0 additions & 59 deletions cmd/etcd.go

This file was deleted.

1 change: 0 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ func main() {
cmd.DNS,
cmd.Exec,
cmd.ExecNode,
cmd.Etcd,
cmd.Harbor,
cmd.Images,
cmd.Logs,
Expand Down
1 change: 0 additions & 1 deletion pkg/api/postgres/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ type OperatorLogicalBackupConfiguration struct {
type OperatorConfigurationData struct {
EnableCRDValidation *bool `json:"enable_crd_validation,omitempty"`
EnableLazySpiloUpgrade bool `json:"enable_lazy_spilo_upgrade,omitempty"`
EtcdHost string `json:"etcd_host,omitempty"`
KubernetesUseConfigMaps bool `json:"kubernetes_use_configmaps,omitempty"`
DockerImage string `json:"docker_image,omitempty"`
Workers uint32 `json:"workers,omitempty"`
Expand Down
8 changes: 1 addition & 7 deletions pkg/provision/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ type Cluster struct {
Nodes NodeMachines
Orphans []types.Machine
Kubernetes kubernetes.Interface
Etcd *EtcdClient
}

func GetCluster(platform *platform.Platform) (*Cluster, error) {
Expand Down Expand Up @@ -117,21 +116,16 @@ func GetCluster(platform *platform.Platform) (*Cluster, error) {
Nodes: nodes,
Orphans: orphans,
Kubernetes: client,
Etcd: GetEtcdClient(platform, client, ""),
}
cluster.Platform = platform
return cluster, nil
}

func (cluster *Cluster) Terminate(node types.Machine) error {
terminate(cluster.Platform, cluster.Etcd, node)
terminate(cluster.Platform, node)
return nil
}

func (cluster *Cluster) GetHealth(node v1.Node) string {
return cluster.Etcd.GetHealth(node)
}

func (cluster *Cluster) Cordon(node v1.Node) error {
return cluster.Platform.Cordon(node.Name)
}
177 changes: 0 additions & 177 deletions pkg/provision/etcd.go

This file was deleted.

1 change: 0 additions & 1 deletion pkg/provision/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func Status(p *platform.Platform) error {
fmt.Fprintf(w, "%s\t", kommons.GetNodeStatus(node))
if kommons.IsMasterNode(node) {
fmt.Fprintf(w, "%s\t", kubeadm.GetNodeVersion(p, nodeMachine.Node))
fmt.Fprintf(w, "%s\t", cluster.GetHealth(node))
} else {
fmt.Fprintf(w, "\t\t")
}
Expand Down
Loading

0 comments on commit 67f4b1a

Please sign in to comment.