Skip to content

Commit ccb1d5e

Browse files
committed
more test fixing
1 parent f1366df commit ccb1d5e

File tree

6 files changed

+18
-20
lines changed

6 files changed

+18
-20
lines changed

pkg/server/options/flags.go

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,14 @@ var (
159159
"show-hidden-metrics-for-version", // The previous version for which you want to show hidden metrics. Only the previous minor version is meaningful, other values will not be allowed. The format is <major>.<minor>, e.g.: '1.16'. The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, rather than being surprised when they are permanently removed in the release after that.
160160

161161
// misc flags
162-
"enable-logs-handler", // If true, install a /logs handler for the apiserver logs.
163-
"event-ttl", // Amount of time to retain events.
164-
"max-connection-bytes-per-sec", // If non-zero, throttle each user connection to this number of bytes/sec. Currently only applies to long-running requests.
165-
"proxy-client-cert-file", // Client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. It is expected that this cert includes a signature from the CA in the --requestheader-client-ca-file flag. That CA is published in the 'extension-apiserver-authentication' configmap in the kube-system namespace. Components receiving calls from kube-aggregator should use that CA to perform their half of the mutual TLS verification.
166-
"proxy-client-key-file", // Private key for the client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins.
162+
"enable-logs-handler", // If true, install a /logs handler for the apiserver logs.
163+
"event-ttl", // Amount of time to retain events.
164+
"max-connection-bytes-per-sec", // If non-zero, throttle each user connection to this number of bytes/sec. Currently only applies to long-running requests.
165+
"proxy-client-cert-file", // Client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. It is expected that this cert includes a signature from the CA in the --requestheader-client-ca-file flag. That CA is published in the 'extension-apiserver-authentication' configmap in the kube-system namespace. Components receiving calls from kube-aggregator should use that CA to perform their half of the mutual TLS verification.
166+
"proxy-client-key-file", // Private key for the client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins.
167+
"coordinated-leadership-lease-duration", // The duration of the lease used for Coordinated Leader Election.
168+
"coordinated-leadership-renew-deadline", // The deadline for renewing a coordinated leader election lease.
169+
"coordinated-leadership-retry-period", // The period for retrying to renew a coordinated leader election lease.
167170
)
168171

169172
disallowedFlags = sets.New[string](
@@ -182,10 +185,12 @@ var (
182185
"enable-garbage-collector", // Enables the generic garbage collector. MUST be synced with the corresponding flag of the kube-controller-manager.
183186

184187
// admission flags
185-
"admission-control-config-file", // File with admission control configuration.
186-
"disable-admission-plugins", // admission plugins that should be disabled although they are in the default enabled plugins list (NamespaceLifecycle). Comma-delimited list of admission plugins: MutatingAdmissionWebhook, NamespaceLifecycle, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter.
187-
"enable-admission-plugins", // admission plugins that should be enabled in addition to default enabled ones (NamespaceLifecycle). Comma-delimited list of admission plugins: MutatingAdmissionWebhook, NamespaceLifecycle, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter.
188-
"admission-control", // Deprecated: Use --enable-admission-plugins or --disable-admission-plugins instead. Will be removed in a future version.
188+
"default-not-ready-toleration-seconds", // Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration.
189+
"default-unreachable-toleration-seconds", // Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration.
190+
"admission-control-config-file", // File with admission control configuration.
191+
"disable-admission-plugins", // admission plugins that should be disabled although they are in the default enabled plugins list (NamespaceLifecycle). Comma-delimited list of admission plugins: MutatingAdmissionWebhook, NamespaceLifecycle, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter.
192+
"enable-admission-plugins", // admission plugins that should be enabled in addition to default enabled ones (NamespaceLifecycle). Comma-delimited list of admission plugins: MutatingAdmissionWebhook, NamespaceLifecycle, ValidatingAdmissionWebhook. The order of plugins in this flag does not matter.
193+
"admission-control", // Deprecated: Use --enable-admission-plugins or --disable-admission-plugins instead. Will be removed in a future version.
189194

190195
// egress selector flags
191196
"egress-selector-config-file", // File with apiserver egress selector configuration.

pkg/virtual/framework/internalapis/fixtures/configmaps.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
metadata:
2-
creationTimestamp: null
32
name: internal.configmaps.core
43
spec:
54
group: ""

pkg/virtual/framework/internalapis/fixtures/namespaces.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
metadata:
2-
creationTimestamp: null
32
name: internal.namespaces.core
43
spec:
54
group: ""

pkg/virtual/framework/internalapis/fixtures/workspaces.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
metadata:
2-
creationTimestamp: null
32
name: internal.workspaces.tenancy.kcp.io
43
spec:
54
group: tenancy.kcp.io

staging/src/github.com/kcp-dev/cli/pkg/crd/plugin/snapshot_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ kind: CustomResourceDefinition
5656
metadata:
5757
annotations:
5858
controller-gen.kubebuilder.io/version: v0.5.0
59-
creationTimestamp: null
6059
name: endpoints.core
6160
spec:
6261
group: ""
@@ -205,7 +204,6 @@ kind: CustomResourceDefinition
205204
metadata:
206205
annotations:
207206
controller-gen.kubebuilder.io/version: v0.5.0
208-
creationTimestamp: null
209207
name: services.core
210208
spec:
211209
group: ""
@@ -362,7 +360,6 @@ spec:
362360
var expectedYAML = `apiVersion: apis.kcp.io/v1alpha1
363361
kind: APIResourceSchema
364362
metadata:
365-
creationTimestamp: null
366363
name: testing.endpoints.core
367364
spec:
368365
conversion:
@@ -583,7 +580,6 @@ spec:
583580
apiVersion: apis.kcp.io/v1alpha1
584581
kind: APIResourceSchema
585582
metadata:
586-
creationTimestamp: null
587583
name: testing.services.core
588584
spec:
589585
conversion:

staging/src/github.com/kcp-dev/sdk/apis/apis/v1alpha2/validation_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ func TestValidateAPIBindingPermissionClaims(t *testing.T) {
155155
},
156156
},
157157
wantErrs: []string{
158-
"spec.permissionClaims[0].selector.matchLabels: Invalid value: v1alpha2.PermissionClaimSelector{LabelSelector:v1.LabelSelector{MatchLabels:map[string]string{\"test\":\"test\"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}, MatchAll:true}: matchLabels cannot be used with matchAll",
159-
"spec.permissionClaims[1].selector.matchExpressions: Invalid value: v1alpha2.PermissionClaimSelector{LabelSelector:v1.LabelSelector{MatchLabels:map[string]string(nil), MatchExpressions:[]v1.LabelSelectorRequirement{v1.LabelSelectorRequirement{Key:\"test\", Operator:\"In\", Values:[]string{\"test\"}}}}, MatchAll:true}: matchExpressions cannot be used with matchAll",
160-
"spec.permissionClaims[2].selector.matchExpressions: Invalid value: v1alpha2.PermissionClaimSelector{LabelSelector:v1.LabelSelector{MatchLabels:map[string]string{\"test\":\"test\"}, MatchExpressions:[]v1.LabelSelectorRequirement{v1.LabelSelectorRequirement{Key:\"test\", Operator:\"In\", Values:[]string{\"test\"}}}}, MatchAll:true}: matchExpressions cannot be used with matchAll",
161-
"spec.permissionClaims[2].selector.matchLabels: Invalid value: v1alpha2.PermissionClaimSelector{LabelSelector:v1.LabelSelector{MatchLabels:map[string]string{\"test\":\"test\"}, MatchExpressions:[]v1.LabelSelectorRequirement{v1.LabelSelectorRequirement{Key:\"test\", Operator:\"In\", Values:[]string{\"test\"}}}}, MatchAll:true}: matchLabels cannot be used with matchAll",
158+
"spec.permissionClaims[0].selector.matchLabels: Invalid value: {\"matchLabels\":{\"test\":\"test\"},\"matchAll\":true}: matchLabels cannot be used with matchAll",
159+
"spec.permissionClaims[1].selector.matchExpressions: Invalid value: {\"matchExpressions\":[{\"key\":\"test\",\"operator\":\"In\",\"values\":[\"test\"]}],\"matchAll\":true}: matchExpressions cannot be used with matchAll",
160+
"spec.permissionClaims[2].selector.matchExpressions: Invalid value: {\"matchLabels\":{\"test\":\"test\"},\"matchExpressions\":[{\"key\":\"test\",\"operator\":\"In\",\"values\":[\"test\"]}],\"matchAll\":true}: matchExpressions cannot be used with matchAll",
161+
"spec.permissionClaims[2].selector.matchLabels: Invalid value: {\"matchLabels\":{\"test\":\"test\"},\"matchExpressions\":[{\"key\":\"test\",\"operator\":\"In\",\"values\":[\"test\"]}],\"matchAll\":true}: matchLabels cannot be used with matchAll",
162162
},
163163
},
164164
}

0 commit comments

Comments
 (0)