Enable containerV2 by default

integration_test/testdata/launcher-custom-experimental-container-v2-with-initial-ram-percentage.yml

@@ -2,5 +2,3 @@ configType: java
 configVersion: 1
 jvmOpts:
   - '-XX:InitialRAMPercentage=70.0'
-experimental:
-  containerV2: true

integration_test/testdata/launcher-custom-experimental-container-v2-with-max-ram-percentage.yml

@@ -2,5 +2,4 @@ configType: java
 configVersion: 1
 jvmOpts:
   - '-XX:MaxRAMPercentage=70.0'
-experimental:
-  containerV2: true
+

integration_test/testdata/launcher-custom-experimental-container-v2-with-xms-and-xmx.yml

@@ -3,5 +3,3 @@ configVersion: 1
 jvmOpts:
   - '-Xms1g'
   - '-Xmx1g'
-experimental:
-  containerV2: true

integration_test/testdata/launcher-custom-experimental-container-v2.yml

@@ -1,5 +1,3 @@
 configType: java
 configVersion: 1
 jvmOpts: []
-experimental:
-  containerV2: true

launchlib/launcher.go

@@ -281,7 +281,10 @@ func delim(str string) string {
 func createJvmOpts(combinedJvmOpts []string, customConfig *CustomLauncherConfig, logger io.WriteCloser) []string {
 	if isEnvVarSet("CONTAINER") && !customConfig.DisableContainerSupport && !hasMaxRAMOverride(combinedJvmOpts) {
 		_, _ = fmt.Fprintln(logger, "Container support enabled")
-		if customConfig.Experimental.ContainerV2 {
+		if !customConfig.Experimental.ContainerV2 {
+			combinedJvmOpts = filterHeapSizeArgs(combinedJvmOpts)
+			combinedJvmOpts = ensureActiveProcessorCount(combinedJvmOpts, logger)
+		} else {
 			jvmOptsWithUpdatedHeapSizeArgs, err := filterHeapSizeArgsV2(combinedJvmOpts)
 			if err != nil {
 				// When we fail to get the memory limit from the cgroups files, fallback to using percentage-based heap
@@ -294,9 +297,6 @@ func createJvmOpts(combinedJvmOpts []string, customConfig *CustomLauncherConfig,
 			} else {
 				combinedJvmOpts = jvmOptsWithUpdatedHeapSizeArgs
 			}
-		} else {
-			combinedJvmOpts = filterHeapSizeArgs(combinedJvmOpts)
-			combinedJvmOpts = ensureActiveProcessorCount(combinedJvmOpts, logger)
 		}
 		return combinedJvmOpts
 	}