Merge pull request #378 from errantepiphany/BAPL-1507_master

[BAPL-1507] remove ContainerCoreLimit and ContainerMaxMemory
kiegroup · Feb 24, 2020 · c8646f7 · c8646f7
2 parents 66fa047 + 2e0847c
commit c8646f7
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 52 deletions.
diff --git a/config/7.7.0/common.yaml b/config/7.7.0/common.yaml
@@ -225,14 +225,6 @@ console:
                   - name: JAVA_DEBUG_PORT
                     value: "[[.Console.Jvm.JavaDebugPort]]"
                   #[[end]]
-                  #[[if .Console.Jvm.ContainerCoreLimit]]
-                  - name: CONTAINER_CORE_LIMIT
-                    value: "[[.Console.Jvm.ContainerCoreLimit]]"
-                  #[[end]]
-                  #[[if .Console.Jvm.ContainerMaxMemory]]
-                  - name: CONTAINER_MAX_MEMORY
-                    value: "[[.Console.Jvm.ContainerMaxMemory]]"
-                  #[[end]]
                   #[[if .Console.Jvm.GcMinHeapFreeRatio]]
                   - name: GC_MIN_HEAP_FREE_RATIO
                     value: "[[.Console.Jvm.GcMinHeapFreeRatio]]"
@@ -775,14 +767,6 @@ servers:
                     - name: JAVA_DEBUG_PORT
                       value: "[[.Jvm.JavaDebugPort]]"
                     #[[end]]
-                    #[[if .Jvm.ContainerCoreLimit]]
-                    - name: CONTAINER_CORE_LIMIT
-                      value: "[[.Jvm.ContainerCoreLimit]]"
-                    #[[end]]
-                    #[[if .Jvm.ContainerMaxMemory]]
-                    - name: CONTAINER_MAX_MEMORY
-                      value: "[[.Jvm.ContainerMaxMemory]]"
-                    #[[end]]
                     #[[if .Jvm.GcMinHeapFreeRatio]]
                     - name: GC_MIN_HEAP_FREE_RATIO
                       value: "[[.Jvm.GcMinHeapFreeRatio]]"

diff --git a/deploy/crds/kieapp.crd.yaml b/deploy/crds/kieapp.crd.yaml
@@ -211,14 +211,6 @@ spec:
                               type: integer
                               format: int32
                               description: Port used for remote debugging. Defaults to 5005. e.g. '8787'
-                            containerCoreLimit:
-                              type: integer
-                              format: int32
-                              description: A calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. e.g. '2'
-                            containerMaxMemory:
-                              type: integer
-                              format: int32
-                              description: Memory limit given to the container. e.g. '1024'
                             gcMinHeapFreeRatio:
                               type: integer
                               format: int32
@@ -589,14 +581,6 @@ spec:
                                 type: integer
                                 format: int32
                                 description: Port used for remote debugging. Defaults to 5005. e.g. '8787'
-                              containerCoreLimit:
-                                type: integer
-                                format: int32
-                                description: A calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. e.g. '2'
-                              containerMaxMemory:
-                                type: integer
-                                format: int32
-                                description: Memory limit given to the container. e.g. '1024'
                               gcMinHeapFreeRatio:
                                 type: integer
                                 format: int32

diff --git a/pkg/apis/app/v2/kieapp_types.go b/pkg/apis/app/v2/kieapp_types.go
@@ -182,8 +182,6 @@ type JvmObject struct {
 	JavaDiagnostics            *bool  `json:"javaDiagnostics,omitempty"`
 	JavaDebug                  *bool  `json:"javaDebug,omitempty"`
 	JavaDebugPort              *int32 `json:"javaDebugPort,omitempty"`
-	ContainerCoreLimit         *int32 `json:"containerCoreLimit,omitempty"`
-	ContainerMaxMemory         *int32 `json:"containerMaxMemory,omitempty"`
 	GcMinHeapFreeRatio         *int32 `json:"gcMinHeapFreeRatio,omitempty"`
 	GcMaxHeapFreeRatio         *int32 `json:"gcMaxHeapFreeRatio,omitempty"`
 	GcTimeRatio                *int32 `json:"gcTimeRatio,omitempty"`

diff --git a/pkg/apis/app/v2/zz_generated.deepcopy.go b/pkg/apis/app/v2/zz_generated.deepcopy.go
diff --git a/pkg/controller/kieapp/defaults/defaults_test.go b/pkg/controller/kieapp/defaults/defaults_test.go
@@ -629,8 +629,6 @@ func createJvmTestObject() *api.JvmObject {
 		JavaDiagnostics:            Pbool(true),
 		JavaDebug:                  Pbool(true),
 		JavaDebugPort:              Pint32(8787),
-		ContainerCoreLimit:         Pint32(2),
-		ContainerMaxMemory:         Pint32(1024),
 		GcMinHeapFreeRatio:         Pint32(20),
 		GcMaxHeapFreeRatio:         Pint32(40),
 		GcTimeRatio:                Pint32(4),
@@ -665,12 +663,6 @@ func testJvmEnv(t *testing.T, envs []corev1.EnvVar) {
 		case "JAVA_DEBUG_PORT":
 			assert.Equal(t, "8787", env.Value)
 
-		case "CONTAINER_CORE_LIMIT":
-			assert.Equal(t, "2", env.Value)
-
-		case "CONTAINER_MAX_MEMORY":
-			assert.Equal(t, "1024", env.Value)
-
 		case "GC_MIN_HEAP_FREE_RATIO":
 			assert.Equal(t, "20", env.Value)