Use existing external names for config

Author: csrwng

pkg/quota/admission/runonceduration/admission_test.go

@@ -159,7 +159,7 @@ func TestRunOnceDurationAdmit(t *testing.T) {
 func TestReadConfig(t *testing.T) {
 	configStr := `apiVersion: v1
 kind: RunOnceDurationConfig
-activeDeadlineSecondsLimit: 3600
+activeDeadlineSecondsOverride: 3600
 `
 	buf := bytes.NewBufferString(configStr)
 	config, err := readConfig(buf)

pkg/quota/admission/runonceduration/api/types.go

@@ -19,4 +19,5 @@ type RunOnceDurationConfig struct {
 
 // ActiveDeadlineSecondsLimitAnnotation can be set on a project to limit the number of
 // seconds that a run-once pod can be active in that project
-const ActiveDeadlineSecondsLimitAnnotation = "openshift.io/active-deadline-seconds-limit"
+// TODO: this label needs to change to reflect its function. It's a limit, not an override.
+const ActiveDeadlineSecondsLimitAnnotation = "openshift.io/active-deadline-seconds-override"

pkg/quota/admission/runonceduration/api/v1/swagger_doc.go

@@ -7,7 +7,7 @@ package v1
 
 var map_RunOnceDurationConfig = map[string]string{
 	"": "RunOnceDurationConfig is the configuration for the RunOnceDuration plugin. It specifies a maximum value for ActiveDeadlineSeconds for a run-once pod. The project that contains the pod may specify a different setting. That setting will take precedence over the one configured for the plugin here.",
-	"activeDeadlineSecondsLimit": "ActiveDeadlineSecondsLimit is the maximum value to set on containers of run-once pods Only a positive value is valid. Absence of a value means that the plugin won't make any changes to the pod",
+	"activeDeadlineSecondsOverride": "ActiveDeadlineSecondsLimit is the maximum value to set on containers of run-once pods Only a positive value is valid. Absence of a value means that the plugin won't make any changes to the pod",
 }
 
 func (RunOnceDurationConfig) SwaggerDoc() map[string]string {

pkg/quota/admission/runonceduration/api/v1/types.go

@@ -14,5 +14,6 @@ type RunOnceDurationConfig struct {
 	// ActiveDeadlineSecondsLimit is the maximum value to set on containers of run-once pods
 	// Only a positive value is valid. Absence of a value means that the plugin
 	// won't make any changes to the pod
-	ActiveDeadlineSecondsLimit *int64 `json:"activeDeadlineSecondsLimit,omitempty",description:"maximum value for activeDeadlineSeconds in run-once pods"`
+	// TODO: change the external name of this field to reflect that it is a limit, not an override
+	ActiveDeadlineSecondsLimit *int64 `json:"activeDeadlineSecondsOverride,omitempty",description:"maximum value for activeDeadlineSeconds in run-once pods"`
 }