Merge pull request #793 from sergioifg94/THREESCALE-8749

THREESCALE-8749: Ability to set APICAST_SERVICE_CACHE_SIZE
3scale · Nov 11, 2022 · 4cf6ab1 · 4cf6ab1
2 parents 5c915e6 + 532c31c
commit 4cf6ab1
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 0 deletions.
diff --git a/apis/apps/v1alpha1/apimanager_types.go b/apis/apps/v1alpha1/apimanager_types.go
@@ -260,6 +260,9 @@ type ApicastProductionSpec struct {
 	// * character, which matches all hosts, effectively disables the proxy.
 	// +optional
 	NoProxy *string `json:"noProxy,omitempty"` // NO_PROXY
+	// ServiceCacheSize specifies the number of services that APICast can store in the internal cache
+	// +optional
+	ServiceCacheSize *int32 `json:"serviceCacheSize,omitempty"`
 }
 
 type ApicastStagingSpec struct {
@@ -315,6 +318,9 @@ type ApicastStagingSpec struct {
 	// * character, which matches all hosts, effectively disables the proxy.
 	// +optional
 	NoProxy *string `json:"noProxy,omitempty"` // NO_PROXY
+	// ServiceCacheSize specifies the number of services that APICast can store in the internal cache
+	// +optional
+	ServiceCacheSize *int32 `json:"serviceCacheSize,omitempty"`
 }
 
 type BackendSpec struct {

diff --git a/apis/apps/v1alpha1/zz_generated.deepcopy.go b/apis/apps/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/apps.3scale.net_apimanagers.yaml b/bundle/manifests/apps.3scale.net_apimanagers.yaml
@@ -639,6 +639,10 @@ spec:
                             description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                      serviceCacheSize:
+                        description: ServiceCacheSize specifies the number of services that APICast can store in the internal cache
+                        format: int32
+                        type: integer
                       tolerations:
                         items:
                           description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
@@ -1269,6 +1273,10 @@ spec:
                             description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                      serviceCacheSize:
+                        description: ServiceCacheSize specifies the number of services that APICast can store in the internal cache
+                        format: int32
+                        type: integer
                       tolerations:
                         items:
                           description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.

diff --git a/config/crd/bases/apps.3scale.net_apimanagers.yaml b/config/crd/bases/apps.3scale.net_apimanagers.yaml
@@ -1118,6 +1118,11 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                      serviceCacheSize:
+                        description: ServiceCacheSize specifies the number of services
+                          that APICast can store in the internal cache
+                        format: int32
+                        type: integer
                       tolerations:
                         items:
                           description: The pod this Toleration is attached to tolerates
@@ -2243,6 +2248,11 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                      serviceCacheSize:
+                        description: ServiceCacheSize specifies the number of services
+                          that APICast can store in the internal cache
+                        format: int32
+                        type: integer
                       tolerations:
                         items:
                           description: The pod this Toleration is attached to tolerates

diff --git a/pkg/3scale/amp/component/apicast.go b/pkg/3scale/amp/component/apicast.go
@@ -365,6 +365,10 @@ func (apicast *Apicast) buildApicastStagingEnv() []v1.EnvVar {
 		result = append(result, helper.EnvVarFromValue("NO_PROXY", *apicast.Options.StagingNoProxy))
 	}
 
+	if apicast.Options.StagingServiceCacheSize != nil {
+		result = append(result, helper.EnvVarFromValue("APICAST_SERVICE_CACHE_SIZE", fmt.Sprintf("%d", *apicast.Options.StagingServiceCacheSize)))
+	}
+
 	return result
 }
 
@@ -437,6 +441,10 @@ func (apicast *Apicast) buildApicastProductionEnv() []v1.EnvVar {
 		result = append(result, helper.EnvVarFromValue("NO_PROXY", *apicast.Options.ProductionNoProxy))
 	}
 
+	if apicast.Options.ProductionServiceCacheSize != nil {
+		result = append(result, helper.EnvVarFromValue("APICAST_SERVICE_CACHE_SIZE", fmt.Sprintf("%d", *apicast.Options.ProductionServiceCacheSize)))
+	}
+
 	return result
 }
 

diff --git a/pkg/3scale/amp/component/apicast_options.go b/pkg/3scale/amp/component/apicast_options.go
@@ -113,6 +113,9 @@ type ApicastOptions struct {
 	StagingHTTPSProxy    *string
 	StagingNoProxy       *string
 
+	ProductionServiceCacheSize *int32
+	StagingServiceCacheSize    *int32
+
 	AdditionalPodAnnotations map[string]string `validate:"required"`
 }
 

diff --git a/pkg/3scale/amp/operator/apicast_options_provider.go b/pkg/3scale/amp/operator/apicast_options_provider.go
@@ -79,6 +79,9 @@ func (a *ApicastOptionsProvider) GetApicastOptions() (*component.ApicastOptions,
 		a.apicastOptions.StagingHTTPSCertificateSecretName = &a.apimanager.Spec.Apicast.StagingSpec.HTTPSCertificateSecretRef.Name
 	}
 
+	a.apicastOptions.ProductionServiceCacheSize = a.apimanager.Spec.Apicast.ProductionSpec.ServiceCacheSize
+	a.apicastOptions.StagingServiceCacheSize = a.apimanager.Spec.Apicast.StagingSpec.ServiceCacheSize
+
 	a.setResourceRequirementsOptions()
 	a.setNodeAffinityAndTolerationsOptions()
 	a.setReplicas()

diff --git a/pkg/3scale/amp/operator/apicast_options_provider_test.go b/pkg/3scale/amp/operator/apicast_options_provider_test.go
@@ -239,6 +239,29 @@ func TestGetApicastOptionsProvider(t *testing.T) {
 				return opts
 			},
 		},
+		{"WithServiceCacheSize",
+			func() *appsv1alpha1.APIManager {
+				apimanager := basicApimanagerTestApicastOptions()
+				var stagingCacheSize int32 = 10
+				var productionCacheSize int32 = 20
+
+				apimanager.Spec.Apicast.ProductionSpec.ServiceCacheSize = &productionCacheSize
+				apimanager.Spec.Apicast.StagingSpec.ServiceCacheSize = &stagingCacheSize
+
+				return apimanager
+			},
+			func() *component.ApicastOptions {
+				opts := defaultApicastOptions()
+
+				var stagingCacheSize int32 = 10
+				var productionCacheSize int32 = 20
+
+				opts.ProductionServiceCacheSize = &productionCacheSize
+				opts.StagingServiceCacheSize = &stagingCacheSize
+
+				return opts
+			},
+		},
 	}
 
 	for _, tc := range cases {