diff --git a/CHANGELOG.md b/CHANGELOG.md index 4335f65cb79..227e924d115 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Bugs * Fix #1500: exec `redirectingInput` was not correctly setting the input pipe (since 4.2.0). + * Fix #1550: MutatingWebhookConfigurationOperationsImpl should be a NonNamespaceOperation Improvements diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/MutatingWebhookConfigurationOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/MutatingWebhookConfigurationOperationsImpl.java new file mode 100644 index 00000000000..e4f6d1bdc15 --- /dev/null +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/MutatingWebhookConfigurationOperationsImpl.java @@ -0,0 +1,53 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client.dsl.internal; + +import io.fabric8.kubernetes.api.model.admissionregistration.DoneableMutatingWebhookConfiguration; +import io.fabric8.kubernetes.api.model.admissionregistration.MutatingWebhookConfiguration; +import io.fabric8.kubernetes.api.model.admissionregistration.MutatingWebhookConfigurationList; +import io.fabric8.kubernetes.client.Config; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation; +import io.fabric8.kubernetes.client.dsl.base.OperationContext; +import okhttp3.OkHttpClient; + + +public class MutatingWebhookConfigurationOperationsImpl extends HasMetadataOperation> { + + public MutatingWebhookConfigurationOperationsImpl(OkHttpClient client, Config config) { + this(new OperationContext().withOkhttpClient(client).withConfig(config)); + } + + public MutatingWebhookConfigurationOperationsImpl(OperationContext context) { + super(context.withApiGroupName("admissionregistration.k8s.io") + .withApiGroupVersion("v1beta1") + .withPlural("mutatingwebhookconfigurations")); + this.type = MutatingWebhookConfiguration.class; + this.listType = MutatingWebhookConfigurationList.class; + this.doneableType = DoneableMutatingWebhookConfiguration.class; + } + + @Override + public MutatingWebhookConfigurationOperationsImpl newInstance(OperationContext context) { + return new MutatingWebhookConfigurationOperationsImpl(context); + } + + @Override + public boolean isResourceNamespaced() { + return false; + } +} + diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MutatingWebhookConfigurationTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MutatingWebhookConfigurationTest.java new file mode 100644 index 00000000000..278730496e8 --- /dev/null +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MutatingWebhookConfigurationTest.java @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client.mock; + +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.admissionregistration.MutatingWebhookConfiguration; +import io.fabric8.kubernetes.api.model.admissionregistration.MutatingWebhookConfigurationBuilder; +import io.fabric8.kubernetes.api.model.admissionregistration.WebhookBuilder; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesServer; +import org.junit.Rule; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class MutatingWebhookConfigurationTest { + @Rule + public KubernetesServer server = new KubernetesServer(); + + @Test + public void create() { + MutatingWebhookConfiguration mutatingWebhookConfiguration = new MutatingWebhookConfigurationBuilder() + .withNewMetadata().withName("mutatingWebhookConfiguration1").endMetadata() + .addToWebhooks(new WebhookBuilder() + .withName("webhook1") + .withNewClientConfig() + .withNewService() + .withName("svc1") + .withNamespace("test") + .withPath("/mutate") + .endService() + .endClientConfig() + .build()) + .build(); + + server.expect().post().withPath("/apis/admissionregistration.k8s.io/v1beta1/mutatingwebhookconfigurations").andReturn(201, mutatingWebhookConfiguration).once(); + + KubernetesClient client = server.getClient(); + HasMetadata response = client.resource(mutatingWebhookConfiguration).createOrReplace(); + assertEquals(mutatingWebhookConfiguration, response); + } +}