Skip to content

Commit

Permalink
Merge pull request #210 from gianlucam76/ready
Browse files Browse the repository at this point in the history
Status.Ready
  • Loading branch information
gianlucam76 committed Jul 22, 2024
2 parents 69423cd + 2d05796 commit 85f7480
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ARCH ?= amd64
OS ?= $(shell uname -s | tr A-Z a-z)
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= main
TAG ?= dev

.PHONY: all
all: build
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: projectsveltos/sveltoscluster-manager:main
- image: projectsveltos/sveltoscluster-manager:dev
name: manager
4 changes: 0 additions & 4 deletions controllers/sveltoscluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ func (r *SveltosClusterReconciler) reconcileNormal(
if err := clientgoscheme.AddToScheme(s); err != nil {
errorMessage := err.Error()
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get scheme: %v", err))
sveltosClusterScope.SveltosCluster.Status.Ready = false
sveltosClusterScope.SveltosCluster.Status.FailureMessage = &errorMessage
return
}
Expand All @@ -155,7 +154,6 @@ func (r *SveltosClusterReconciler) reconcileNormal(
if err != nil {
errorMessage := err.Error()
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get client: %v", err))
sveltosClusterScope.SveltosCluster.Status.Ready = false
sveltosClusterScope.SveltosCluster.Status.FailureMessage = &errorMessage
return
}
Expand All @@ -166,7 +164,6 @@ func (r *SveltosClusterReconciler) reconcileNormal(
if err != nil {
errorMessage := err.Error()
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get client: %v", err))
sveltosClusterScope.SveltosCluster.Status.Ready = false
sveltosClusterScope.SveltosCluster.Status.FailureMessage = &errorMessage
return
}
Expand All @@ -180,7 +177,6 @@ func (r *SveltosClusterReconciler) reconcileNormal(
if err != nil && !apierrors.IsNotFound(err) {
errorMessage := err.Error()
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get projectsveltos namespace: %v", err))
sveltosClusterScope.SveltosCluster.Status.Ready = false
sveltosClusterScope.SveltosCluster.Status.FailureMessage = &errorMessage
} else {
currentVersion, err := utils.GetKubernetesVersion(ctx, config, logger)
Expand Down
2 changes: 1 addition & 1 deletion manifest/deployment-shard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/sveltoscluster-manager:main
image: projectsveltos/sveltoscluster-manager:dev
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/sveltoscluster-manager:main
image: projectsveltos/sveltoscluster-manager:dev
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down

0 comments on commit 85f7480

Please sign in to comment.