New Release v1.1.8 for OCI Service Operator (#40)

New Release v1.1.8 for OCI Service Operator

- Update MaxControllerDelay for all resource controllers
- Remove watch on deployments for IngressGatewayDeployment
- Update BaseDelay for exponential backoff

Co-authored-by: giriraj34
Co-authored-by: ahwille
Co-authored-by: Shashank Nagamalla

README.md

@@ -25,7 +25,7 @@ See the [Documentation](docs/README.md#oci-service-operator-for-kubernetes) for
 The OCI Service Operator for Kubernetes is packaged as Operator Lifecycle Manager (OLM) Bundle for making it easy to install in Kubernetes Clusters. The bundle can be downloaded as docker image using below command.
 
 ```
-docker pull iad.ocir.io/oracle/oci-service-operator-bundle:1.1.1
+docker pull iad.ocir.io/oracle/oci-service-operator-bundle:1.1.8
 ```
 
 ## Samples

main.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"time"
 
-	appsv1 "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -510,7 +509,6 @@ func main() {
 
 	enqueueRequestsForConfigmapEvents := ingressgatewaydeployment.NewEnqueueRequestsForConfigmapEvents(mgr.GetClient(), ctrl.Log.WithName("controllers").WithName("IngressGatewayDeployment"), operatorNamespace)
 	igdCustomWatches := []servicemeshcontrollers.CustomWatch{
-		ingressgatewaydeployment.GetIngressGatewayDeploymentOwnerWatch(&appsv1.Deployment{}),
 		ingressgatewaydeployment.GetIngressGatewayDeploymentOwnerWatch(&corev1.Service{}),
 		ingressgatewaydeployment.GetIngressGatewayDeploymentOwnerWatch(&autoscalingv1.HorizontalPodAutoscaler{}),
 		{

pkg/servicemanager/servicemesh/manager/servicemesh_servicemanager.go

@@ -150,7 +150,7 @@ func (c *ServiceMeshServiceManager) CreateOrUpdate(ctx context.Context, obj runt
 	if resolveDependenciesErr != nil {
 		return meshErrors.GetOsokResponseByHandlingReconcileError(resolveDependenciesErr)
 	}
-
+	c.log.InfoLogWithFixedMessage(ctx, "dependencies resolved")
 	getResourceErr := c.handler.GetResource(ctx, object, resourceDetails)
 	if getResourceErr != nil {
 		_ = c.UpdateServiceMeshConfiguredStatus(ctx, object, getResourceErr)
@@ -193,6 +193,7 @@ func (c *ServiceMeshServiceManager) CreateOrUpdate(ctx context.Context, obj runt
 	if !resourceCreated {
 		_ = c.UpdateServiceMeshConfiguredStatus(ctx, object, resourceCreationErr)
 		if resourceCreationErr != nil {
+			c.log.InfoLogWithFixedMessage(ctx, "cp error while creating resource", "error", resourceCreationErr)
 			if !meshErrors.IsNetworkErrorOrInternalError(resourceCreationErr) {
 				// Clears the opcRetryToken if the request didn't fail for network or internal error
 				_ = c.UpdateOpcRetryToken(ctx, object, nil)

pkg/servicemanager/servicemesh/utils/commons/duration.go

@@ -10,8 +10,8 @@ import "time"
 const (
 	// Delay duration parameters for rate limiter exponential back off
 	MaxDelay           = 10 * time.Second
-	MaxControllerDelay = 10 * time.Minute
-	BaseDelay          = 5 * time.Millisecond
+	MaxControllerDelay = 1 * time.Minute
+	BaseDelay          = 500 * time.Millisecond
 
 	PollInterval = time.Second * 5
 

pkg/servicemanager/servicemesh/utils/commons/ratelimiter_test.go

@@ -13,23 +13,20 @@ import (
 )
 
 func TestDefaultControllerRateLimiter(t *testing.T) {
-	limiter := DefaultControllerRateLimiter(10 * time.Second)
+	limiter := DefaultControllerRateLimiter(1 * time.Minute)
 
-	assert.Equal(t, 5*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 10*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 20*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 40*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 80*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 160*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 320*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 640*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 1280*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 2560*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 5120*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 10000*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 10000*time.Millisecond, limiter.When("one"))
-	assert.Equal(t, 10000*time.Millisecond, limiter.When("one"))
+	assert.Equal(t, 500*time.Millisecond, limiter.When("one"))
+	assert.Equal(t, 1*time.Second, limiter.When("one"))
+	assert.Equal(t, 2*time.Second, limiter.When("one"))
+	assert.Equal(t, 4*time.Second, limiter.When("one"))
+	assert.Equal(t, 8*time.Second, limiter.When("one"))
+	assert.Equal(t, 16*time.Second, limiter.When("one"))
+	assert.Equal(t, 32*time.Second, limiter.When("one"))
+	assert.Equal(t, 1*time.Minute, limiter.When("one"))
+	assert.Equal(t, 1*time.Minute, limiter.When("one"))
+	assert.Equal(t, 1*time.Minute, limiter.When("one"))
+	assert.Equal(t, 1*time.Minute, limiter.When("one"))
 
-	assert.Equal(t, 5*time.Millisecond, limiter.When("two"))
-	assert.Equal(t, 10*time.Millisecond, limiter.When("two"))
+	assert.Equal(t, 500*time.Millisecond, limiter.When("two"))
+	assert.Equal(t, 1*time.Second, limiter.When("two"))
 }