forked from aenix-io/etcd-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Refactor resource generation (aenix-io#84)
Closes aenix-io#55
- Loading branch information
1 parent
2d34e62
commit d6e430c
Showing
8 changed files
with
415 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| Copyright 2024 The etcd-operator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package factory | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/utils/ptr" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
|
|
||
| etcdaenixiov1alpha1 "github.com/aenix-io/etcd-operator/api/v1alpha1" | ||
| ) | ||
|
|
||
| var _ = Describe("CreateOrUpdateClusterStateConfigMap handlers", func() { | ||
| Context("When ensuring a configMap", func() { | ||
| const resourceName = "test-resource" | ||
|
|
||
| ctx := context.Background() | ||
|
|
||
| etcdcluster := &etcdaenixiov1alpha1.EtcdCluster{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: resourceName, | ||
| Namespace: "default", | ||
| UID: "test-uid", | ||
| }, | ||
| Spec: etcdaenixiov1alpha1.EtcdClusterSpec{ | ||
| Replicas: ptr.To(int32(3)), | ||
| }, | ||
| } | ||
| typeNamespacedName := types.NamespacedName{ | ||
| Name: GetClusterStateConfigMapName(etcdcluster), | ||
| Namespace: "default", | ||
| } | ||
|
|
||
| It("should successfully ensure the configmap", func() { | ||
| cm := &corev1.ConfigMap{} | ||
|
|
||
| By("creating the configmap for initial cluster") | ||
| err := CreateOrUpdateClusterStateConfigMap(ctx, etcdcluster, false, k8sClient, k8sClient.Scheme()) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| err = k8sClient.Get(ctx, typeNamespacedName, cm) | ||
| cmUid := cm.UID | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(cm.Data["ETCD_INITIAL_CLUSTER_STATE"]).To(Equal("new")) | ||
|
|
||
| By("updating the configmap for initialized cluster") | ||
| err = CreateOrUpdateClusterStateConfigMap(ctx, etcdcluster, true, k8sClient, k8sClient.Scheme()) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| err = k8sClient.Get(ctx, typeNamespacedName, cm) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(cm.Data["ETCD_INITIAL_CLUSTER_STATE"]).To(Equal("existing")) | ||
| // Check that we are updating the same configmap | ||
| Expect(cm.UID).To(Equal(cmUid)) | ||
|
|
||
| By("deleting the configmap") | ||
|
|
||
| Expect(k8sClient.Delete(ctx, cm)).To(Succeed()) | ||
| }) | ||
|
|
||
| It("should fail on creating the configMap with invalid owner reference", func() { | ||
| etcdcluster := etcdcluster.DeepCopy() | ||
| emptyScheme := runtime.NewScheme() | ||
|
|
||
| err := CreateOrUpdateClusterStateConfigMap(ctx, etcdcluster, false, k8sClient, emptyScheme) | ||
| Expect(err).To(HaveOccurred()) | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| Copyright 2024 The etcd-operator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package factory | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| etcdaenixiov1alpha1 "github.com/aenix-io/etcd-operator/api/v1alpha1" | ||
| ) | ||
|
|
||
| func GetClientServiceName(cluster *etcdaenixiov1alpha1.EtcdCluster) string { | ||
| return fmt.Sprintf("%s-client", cluster.Name) | ||
| } | ||
|
|
||
| func CreateOrUpdateClusterService( | ||
| ctx context.Context, | ||
| cluster *etcdaenixiov1alpha1.EtcdCluster, | ||
| rclient client.Client, | ||
| rscheme *runtime.Scheme, | ||
| ) error { | ||
| svc := &corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: cluster.Name, | ||
| Namespace: cluster.Namespace, | ||
| Labels: map[string]string{ | ||
| "app.kubernetes.io/name": "etcd", | ||
| "app.kubernetes.io/instance": cluster.Name, | ||
| "app.kubernetes.io/managed-by": "etcd-operator", | ||
| }, | ||
| }, | ||
| Spec: corev1.ServiceSpec{ | ||
| Ports: []corev1.ServicePort{ | ||
| {Name: "peer", TargetPort: intstr.FromInt32(2380), Port: 2380, Protocol: corev1.ProtocolTCP}, | ||
| {Name: "client", TargetPort: intstr.FromInt32(2379), Port: 2379, Protocol: corev1.ProtocolTCP}, | ||
| }, | ||
| Type: corev1.ServiceTypeClusterIP, | ||
| ClusterIP: "None", | ||
| Selector: map[string]string{ | ||
| "app.kubernetes.io/name": "etcd", | ||
| "app.kubernetes.io/instance": cluster.Name, | ||
| "app.kubernetes.io/managed-by": "etcd-operator", | ||
| }, | ||
| PublishNotReadyAddresses: true, | ||
| }, | ||
| } | ||
|
|
||
| if err := ctrl.SetControllerReference(cluster, svc, rscheme); err != nil { | ||
| return fmt.Errorf("cannot set controller reference: %w", err) | ||
| } | ||
|
|
||
| return reconcileService(ctx, rclient, cluster.Name, svc) | ||
| } | ||
|
|
||
| func CreateOrUpdateClientService( | ||
| ctx context.Context, | ||
| cluster *etcdaenixiov1alpha1.EtcdCluster, | ||
| rclient client.Client, | ||
| rscheme *runtime.Scheme, | ||
| ) error { | ||
| svc := &corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: GetClientServiceName(cluster), | ||
| Namespace: cluster.Namespace, | ||
| Labels: map[string]string{ | ||
| "app.kubernetes.io/name": "etcd", | ||
| "app.kubernetes.io/instance": cluster.Name, | ||
| "app.kubernetes.io/managed-by": "etcd-operator", | ||
| }, | ||
| }, | ||
| Spec: corev1.ServiceSpec{ | ||
| Ports: []corev1.ServicePort{ | ||
| {Name: "client", TargetPort: intstr.FromInt32(2379), Port: 2379, Protocol: corev1.ProtocolTCP}, | ||
| }, | ||
| Type: corev1.ServiceTypeClusterIP, | ||
| Selector: map[string]string{ | ||
| "app.kubernetes.io/name": "etcd", | ||
| "app.kubernetes.io/instance": cluster.Name, | ||
| "app.kubernetes.io/managed-by": "etcd-operator", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| if err := ctrl.SetControllerReference(cluster, svc, rscheme); err != nil { | ||
| return fmt.Errorf("cannot set controller reference: %w", err) | ||
| } | ||
|
|
||
| return reconcileService(ctx, rclient, cluster.Name, svc) | ||
| } |
Oops, something went wrong.