mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Merge pull request #126878 from aaron-prindle/emu-version-feat-gate
chore: migrate kube feature RelaxedEnvironmentVariableValidation to new versioned kube feature file and syntax
This commit is contained in:
		@@ -1133,8 +1133,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha},
 | 
						RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	RelaxedEnvironmentVariableValidation: {Default: false, PreRelease: featuregate.Alpha},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	ReloadKubeletServerCertificateFile: {Default: true, PreRelease: featuregate.Beta},
 | 
						ReloadKubeletServerCertificateFile: {Default: true, PreRelease: featuregate.Beta},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ResourceHealthStatus: {Default: false, PreRelease: featuregate.Alpha},
 | 
						ResourceHealthStatus: {Default: false, PreRelease: featuregate.Alpha},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,6 +17,7 @@ limitations under the License.
 | 
				
			|||||||
package features
 | 
					package features
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"k8s.io/apimachinery/pkg/util/version"
 | 
				
			||||||
	"k8s.io/component-base/featuregate"
 | 
						"k8s.io/component-base/featuregate"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -27,8 +28,7 @@ import (
 | 
				
			|||||||
// Entries are separated from each other with blank lines to avoid sweeping gofmt changes
 | 
					// Entries are separated from each other with blank lines to avoid sweeping gofmt changes
 | 
				
			||||||
// when adding or removing one entry.
 | 
					// when adding or removing one entry.
 | 
				
			||||||
var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
 | 
					var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
 | 
				
			||||||
	// Example:
 | 
						RelaxedEnvironmentVariableValidation: {
 | 
				
			||||||
	// genericfeatures.EmulationVersion: {
 | 
							{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
 | 
				
			||||||
	// 	{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
 | 
						},
 | 
				
			||||||
	// },
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -622,12 +622,6 @@
 | 
				
			|||||||
    lockToDefault: false
 | 
					    lockToDefault: false
 | 
				
			||||||
    preRelease: Beta
 | 
					    preRelease: Beta
 | 
				
			||||||
    version: ""
 | 
					    version: ""
 | 
				
			||||||
- name: RelaxedEnvironmentVariableValidation
 | 
					 | 
				
			||||||
  versionedSpecs:
 | 
					 | 
				
			||||||
  - default: false
 | 
					 | 
				
			||||||
    lockToDefault: false
 | 
					 | 
				
			||||||
    preRelease: Alpha
 | 
					 | 
				
			||||||
    version: ""
 | 
					 | 
				
			||||||
- name: ReloadKubeletServerCertificateFile
 | 
					- name: ReloadKubeletServerCertificateFile
 | 
				
			||||||
  versionedSpecs:
 | 
					  versionedSpecs:
 | 
				
			||||||
  - default: true
 | 
					  - default: true
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1,6 @@
 | 
				
			|||||||
[]
 | 
					- name: RelaxedEnvironmentVariableValidation
 | 
				
			||||||
 | 
					  versionedSpecs:
 | 
				
			||||||
 | 
					  - default: false
 | 
				
			||||||
 | 
					    lockToDefault: false
 | 
				
			||||||
 | 
					    preRelease: Alpha
 | 
				
			||||||
 | 
					    version: "1.30"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user