Rename RunnerSet to RunnerReplicaSet

To hand over the name `RunnerSet` to the new StatefulSet-based implementation of that being developed at #4

controllers/runnerdeployment_controller.go

@@ -67,30 +67,30 @@ func (r *RunnerDeploymentReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 		return ctrl.Result{}, nil
 	}
 
-	var myRunnerSetList v1alpha1.RunnerSetList
-	if err := r.List(ctx, &myRunnerSetList, client.InNamespace(req.Namespace), client.MatchingFields{runnerSetOwnerKey: req.Name}); err != nil {
+	var myRunnerReplicaSetList v1alpha1.RunnerReplicaSetList
+	if err := r.List(ctx, &myRunnerReplicaSetList, client.InNamespace(req.Namespace), client.MatchingFields{runnerSetOwnerKey: req.Name}); err != nil {
 		return ctrl.Result{}, err
 	}
 
-	myRunnerSets := myRunnerSetList.Items
+	myRunnerReplicaSets := myRunnerReplicaSetList.Items
 
-	sort.Slice(myRunnerSets, func(i, j int) bool {
-		return myRunnerSets[i].GetCreationTimestamp().After(myRunnerSets[j].GetCreationTimestamp().Time)
+	sort.Slice(myRunnerReplicaSets, func(i, j int) bool {
+		return myRunnerReplicaSets[i].GetCreationTimestamp().After(myRunnerReplicaSets[j].GetCreationTimestamp().Time)
 	})
 
-	var newestSet *v1alpha1.RunnerSet
+	var newestSet *v1alpha1.RunnerReplicaSet
 
-	var oldSets []v1alpha1.RunnerSet
+	var oldSets []v1alpha1.RunnerReplicaSet
 
-	if len(myRunnerSets) > 0 {
-		newestSet = &myRunnerSets[0]
+	if len(myRunnerReplicaSets) > 0 {
+		newestSet = &myRunnerReplicaSets[0]
 	}
 
-	if len(myRunnerSets) > 1 {
-		oldSets = myRunnerSets[1:]
+	if len(myRunnerReplicaSets) > 1 {
+		oldSets = myRunnerReplicaSets[1:]
 	}
 
-	desiredRS, err := r.newRunnerSet(rd)
+	desiredRS, err := r.newRunnerReplicaSet(rd)
 	if err != nil {
 		log.Error(err, "Could not create runnerset")
 
@@ -153,14 +153,14 @@ func (r *RunnerDeploymentReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 			return ctrl.Result{}, err
 		}
 
-		r.Recorder.Event(&rd, corev1.EventTypeNormal, "RunnerSetDeleted", fmt.Sprintf("Deleted runnerset '%s'", rs.Name))
+		r.Recorder.Event(&rd, corev1.EventTypeNormal, "RunnerReplicaSetDeleted", fmt.Sprintf("Deleted runnerset '%s'", rs.Name))
 		log.Info("Deleted runnerset", "runnerdeployment", rd.ObjectMeta.Name, "runnerset", rs.Name)
 	}
 
 	return ctrl.Result{}, nil
 }
 
-func getTemplateHash(rs *v1alpha1.RunnerSet) (string, bool) {
+func getTemplateHash(rs *v1alpha1.RunnerReplicaSet) (string, bool) {
 	hash, ok := rs.Labels[LabelKeyRunnerTemplateHash]
 
 	return hash, ok
@@ -206,7 +206,7 @@ func CloneAndAddLabel(labels map[string]string, labelKey, labelValue string) map
 	return newLabels
 }
 
-func (r *RunnerDeploymentReconciler) newRunnerSet(rd v1alpha1.RunnerDeployment) (v1alpha1.RunnerSet, error) {
+func (r *RunnerDeploymentReconciler) newRunnerReplicaSet(rd v1alpha1.RunnerDeployment) (v1alpha1.RunnerReplicaSet, error) {
 	newRSTemplate := *rd.Spec.Template.DeepCopy()
 	templateHash := ComputeHash(&newRSTemplate)
 	// Add template hash label to selector.
@@ -214,14 +214,14 @@ func (r *RunnerDeploymentReconciler) newRunnerSet(rd v1alpha1.RunnerDeployment)
 
 	newRSTemplate.Labels = labels
 
-	rs := v1alpha1.RunnerSet{
+	rs := v1alpha1.RunnerReplicaSet{
 		TypeMeta: metav1.TypeMeta{},
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: rd.ObjectMeta.Name,
 			Namespace:    rd.ObjectMeta.Namespace,
 			Labels:       labels,
 		},
-		Spec: v1alpha1.RunnerSetSpec{
+		Spec: v1alpha1.RunnerReplicaSetSpec{
 			Replicas: rd.Spec.Replicas,
 			Template: newRSTemplate,
 		},
@@ -237,8 +237,8 @@ func (r *RunnerDeploymentReconciler) newRunnerSet(rd v1alpha1.RunnerDeployment)
 func (r *RunnerDeploymentReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.Recorder = mgr.GetEventRecorderFor("runnerdeployment-controller")
 
-	if err := mgr.GetFieldIndexer().IndexField(&v1alpha1.RunnerSet{}, runnerSetOwnerKey, func(rawObj runtime.Object) []string {
-		runnerSet := rawObj.(*v1alpha1.RunnerSet)
+	if err := mgr.GetFieldIndexer().IndexField(&v1alpha1.RunnerReplicaSet{}, runnerSetOwnerKey, func(rawObj runtime.Object) []string {
+		runnerSet := rawObj.(*v1alpha1.RunnerReplicaSet)
 		owner := metav1.GetControllerOf(runnerSet)
 		if owner == nil {
 			return nil
@@ -255,6 +255,6 @@ func (r *RunnerDeploymentReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&v1alpha1.RunnerDeployment{}).
-		Owns(&v1alpha1.RunnerSet{}).
+		Owns(&v1alpha1.RunnerReplicaSet{}).
 		Complete(r)
 }

controllers/runnerdeployment_controller_test.go

@@ -72,7 +72,7 @@ var _ = Context("Inside of a new namespace", func() {
 
 	Describe("when no existing resources exist", func() {
 
-		It("should create a new RunnerSet resource from the specified template, add a another RunnerSet on template modification, and eventually removes old runnersets", func() {
+		It("should create a new RunnerReplicaSet resource from the specified template, add a another RunnerReplicaSet on template modification, and eventually removes old runnersets", func() {
 			name := "example-runnerdeploy"
 
 			{
@@ -97,9 +97,9 @@ var _ = Context("Inside of a new namespace", func() {
 
 				err := k8sClient.Create(ctx, rs)
 
-				Expect(err).NotTo(HaveOccurred(), "failed to create test RunnerSet resource")
+				Expect(err).NotTo(HaveOccurred(), "failed to create test RunnerReplicaSet resource")
 
-				runnerSets := actionsv1alpha1.RunnerSetList{Items: []actionsv1alpha1.RunnerSet{}}
+				runnerSets := actionsv1alpha1.RunnerReplicaSetList{Items: []actionsv1alpha1.RunnerReplicaSet{}}
 
 				Eventually(
 					func() int {
@@ -138,7 +138,7 @@ var _ = Context("Inside of a new namespace", func() {
 
 					err := k8sClient.Get(ctx, types.NamespacedName{Namespace: ns.Name, Name: name}, &rd)
 
-					Expect(err).NotTo(HaveOccurred(), "failed to get test RunnerSet resource")
+					Expect(err).NotTo(HaveOccurred(), "failed to get test RunnerReplicaSet resource")
 
 					rd.Spec.Replicas = intPtr(2)
 
@@ -146,7 +146,7 @@ var _ = Context("Inside of a new namespace", func() {
 				},
 					time.Second*1, time.Millisecond*500).Should(BeNil())
 
-				runnerSets := actionsv1alpha1.RunnerSetList{Items: []actionsv1alpha1.RunnerSet{}}
+				runnerSets := actionsv1alpha1.RunnerReplicaSetList{Items: []actionsv1alpha1.RunnerReplicaSet{}}
 
 				Eventually(
 					func() int {

controllers/runnerreplicaset_controller.go

@@ -32,8 +32,8 @@ import (
 	"github.com/summerwind/actions-runner-controller/api/v1alpha1"
 )
 
-// RunnerSetReconciler reconciles a Runner object
-type RunnerSetReconciler struct {
+// RunnerReplicaSetReconciler reconciles a Runner object
+type RunnerReplicaSetReconciler struct {
 	client.Client
 	Log      logr.Logger
 	Recorder record.EventRecorder
@@ -45,11 +45,11 @@ type RunnerSetReconciler struct {
 // +kubebuilder:rbac:groups=actions.summerwind.dev,resources=runners,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=actions.summerwind.dev,resources=runners/status,verbs=get;update;patch
 
-func (r *RunnerSetReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
+func (r *RunnerReplicaSetReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	ctx := context.Background()
 	log := r.Log.WithValues("runner", req.NamespacedName)
 
-	var rs v1alpha1.RunnerSet
+	var rs v1alpha1.RunnerReplicaSet
 	if err := r.Get(ctx, req.NamespacedName, &rs); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
@@ -137,7 +137,7 @@ func (r *RunnerSetReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	return ctrl.Result{}, nil
 }
 
-func (r *RunnerSetReconciler) newRunner(rs v1alpha1.RunnerSet) (v1alpha1.Runner, error) {
+func (r *RunnerReplicaSetReconciler) newRunner(rs v1alpha1.RunnerReplicaSet) (v1alpha1.Runner, error) {
 	objectMeta := rs.Spec.Template.ObjectMeta.DeepCopy()
 
 	objectMeta.GenerateName = rs.ObjectMeta.Name
@@ -156,11 +156,11 @@ func (r *RunnerSetReconciler) newRunner(rs v1alpha1.RunnerSet) (v1alpha1.Runner,
 	return runner, nil
 }
 
-func (r *RunnerSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *RunnerReplicaSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.Recorder = mgr.GetEventRecorderFor("runnerset-controller")
 
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&v1alpha1.RunnerSet{}).
+		For(&v1alpha1.RunnerReplicaSet{}).
 		Owns(&v1alpha1.Runner{}).
 		Complete(r)
 }

controllers/runnerreplicaset_controller_test.go

@@ -22,7 +22,7 @@ import (
 // This includes:
 // * creating a Namespace to be used during the test
 // * starting the 'RunnerReconciler'
-// * stopping the 'RunnerSetReconciler" after the test ends
+// * stopping the 'RunnerReplicaSetReconciler" after the test ends
 // Call this function at the start of each of your tests.
 func SetupTest(ctx context.Context) *corev1.Namespace {
 	var stopCh chan struct{}
@@ -40,7 +40,7 @@ func SetupTest(ctx context.Context) *corev1.Namespace {
 		mgr, err := ctrl.NewManager(cfg, ctrl.Options{})
 		Expect(err).NotTo(HaveOccurred(), "failed to create manager")
 
-		controller := &RunnerSetReconciler{
+		controller := &RunnerReplicaSetReconciler{
 			Client:   mgr.GetClient(),
 			Scheme:   scheme.Scheme,
 			Log:      logf.Log,
@@ -91,12 +91,12 @@ var _ = Context("Inside of a new namespace", func() {
 			name := "example-runnerset"
 
 			{
-				rs := &actionsv1alpha1.RunnerSet{
+				rs := &actionsv1alpha1.RunnerReplicaSet{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      name,
 						Namespace: ns.Name,
 					},
-					Spec: actionsv1alpha1.RunnerSetSpec{
+					Spec: actionsv1alpha1.RunnerReplicaSetSpec{
 						Replicas: intPtr(1),
 						Template: actionsv1alpha1.RunnerTemplate{
 							Spec: actionsv1alpha1.RunnerSpec{
@@ -112,7 +112,7 @@ var _ = Context("Inside of a new namespace", func() {
 
 				err := k8sClient.Create(ctx, rs)
 
-				Expect(err).NotTo(HaveOccurred(), "failed to create test RunnerSet resource")
+				Expect(err).NotTo(HaveOccurred(), "failed to create test RunnerReplicaSet resource")
 
 				runners := actionsv1alpha1.RunnerList{Items: []actionsv1alpha1.Runner{}}
 
@@ -133,11 +133,11 @@ var _ = Context("Inside of a new namespace", func() {
 				// made by the controller to update .Status.AvailableReplicas and .Status.ReadyReplicas
 				//   Operation cannot be fulfilled on runnersets.actions.summerwind.dev "example-runnerset": the object has been modified; please apply your changes to the latest version and try again
 				Eventually(func() error {
-					var rs actionsv1alpha1.RunnerSet
+					var rs actionsv1alpha1.RunnerReplicaSet
 
 					err := k8sClient.Get(ctx, types.NamespacedName{Namespace: ns.Name, Name: name}, &rs)
 
-					Expect(err).NotTo(HaveOccurred(), "failed to get test RunnerSet resource")
+					Expect(err).NotTo(HaveOccurred(), "failed to get test RunnerReplicaSet resource")
 
 					rs.Spec.Replicas = intPtr(2)
 
@@ -164,11 +164,11 @@ var _ = Context("Inside of a new namespace", func() {
 				// made by the controller to update .Status.AvailableReplicas and .Status.ReadyReplicas
 				//   Operation cannot be fulfilled on runnersets.actions.summerwind.dev "example-runnerset": the object has been modified; please apply your changes to the latest version and try again
 				Eventually(func() error {
-					var rs actionsv1alpha1.RunnerSet
+					var rs actionsv1alpha1.RunnerReplicaSet
 
 					err := k8sClient.Get(ctx, types.NamespacedName{Namespace: ns.Name, Name: name}, &rs)
 
-					Expect(err).NotTo(HaveOccurred(), "failed to get test RunnerSet resource")
+					Expect(err).NotTo(HaveOccurred(), "failed to get test RunnerReplicaSet resource")
 
 					rs.Spec.Replicas = intPtr(0)