diff --git a/details/operator-sdk/api/v1/astraconnector_types.go b/details/operator-sdk/api/v1/astraconnector_types.go index d0706bf8..e47c7e1c 100644 --- a/details/operator-sdk/api/v1/astraconnector_types.go +++ b/details/operator-sdk/api/v1/astraconnector_types.go @@ -18,9 +18,8 @@ type Astra struct { // +kubebuilder:validation:Optional ClusterName string `json:"clusterName,omitempty"` // +kubebuilder:validation:Optional - SkipTLSValidation bool `json:"skipTLSValidation,omitempty"` - // +kubebuilder:validation:Required - TokenRef string `json:"tokenRef,omitempty"` + SkipTLSValidation bool `json:"skipTLSValidation,omitempty"` + TokenRef string `json:"tokenRef,omitempty"` // +kubebuilder:validation:Optional Unregister bool `json:"unregister,omitempty"` } diff --git a/details/operator-sdk/config/crd/bases/astra.netapp.io_astraconnectors.yaml b/details/operator-sdk/config/crd/bases/astra.netapp.io_astraconnectors.yaml index 4e5615ec..c571cfd1 100644 --- a/details/operator-sdk/config/crd/bases/astra.netapp.io_astraconnectors.yaml +++ b/details/operator-sdk/config/crd/bases/astra.netapp.io_astraconnectors.yaml @@ -69,7 +69,6 @@ spec: - accountId - cloudId - clusterId - - tokenRef type: object astraConnect: properties: @@ -189,7 +188,6 @@ spec: - accountId - cloudId - clusterId - - tokenRef type: object astraConnect: properties: diff --git a/details/operator-sdk/config/manager/manager.yaml b/details/operator-sdk/config/manager/manager.yaml index 0f29d4b0..ab07d520 100644 --- a/details/operator-sdk/config/manager/manager.yaml +++ b/details/operator-sdk/config/manager/manager.yaml @@ -1,10 +1,3 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - control-plane: controller-manager - name: system ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/details/operator-sdk/controllers/astraconnector_controller.go b/details/operator-sdk/controllers/astraconnector_controller.go index 08a85376..3c1fa03b 100644 --- a/details/operator-sdk/controllers/astraconnector_controller.go +++ b/details/operator-sdk/controllers/astraconnector_controller.go @@ -10,6 +10,7 @@ import ( "fmt" "net/http" "reflect" + "sigs.k8s.io/controller-runtime/pkg/builder" "strings" "time" @@ -450,7 +451,7 @@ func getPodNames(pods []corev1.Pod) []string { // SetupWithManager sets up the controller with the Manager. func (r *AstraConnectorController) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). - For(&v1.AstraConnector{}). + For(&v1.AstraConnector{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})). Owns(&appsv1.Deployment{}). Owns(&appsv1.StatefulSet{}). Owns(&corev1.Service{}). diff --git a/details/operator-sdk/controllers/deployer.go b/details/operator-sdk/controllers/deployer.go index 24a4fdcb..ef50924f 100644 --- a/details/operator-sdk/controllers/deployer.go +++ b/details/operator-sdk/controllers/deployer.go @@ -64,7 +64,7 @@ func (r *AstraConnectorController) deployResources(ctx context.Context, deployer // todo we need to use event and not use status because that causes reconciles log.Info(statusMsg) //natsSyncClientStatus.Status = statusMsg - //_ = r.updateAstraConnectorStatus(ctx, astraConnector, *natsSyncClientStatus) + _ = r.updateAstraConnectorStatus(ctx, astraConnector, *natsSyncClientStatus) result, err := k8sUtil.CreateOrUpdateResource(ctx, kubeObject, astraConnector, mutateFunc) if err != nil {