Fix fabric8io#1550: MutatingWebhookConfigurationOperationsImpl should…

… be a NonNamespaceOperation
hbellomusto · May 24, 2019 · af0e7ae · af0e7ae
1 parent c78cc4d
commit af0e7ae
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
     * Fix #1507: remove unnecessary OutputStream copying a directory and return the directory object instead the file object when a directory is copied or read
     * Fix #758: Deleting Deployments with `.cascading(true)` creates a new Replica Set
     * Fix #1515: HasMetadataOperation.periodicWatchUntilReady is broken
+    * Fix #1550: MutatingWebhookConfigurationOperationsImpl should be a NonNamespaceOperation
 
   Improvements
 

diff --git a/...io/fabric8/kubernetes/client/dsl/internal/MutatingWebhookConfigurationOperationsImpl.java b/...io/fabric8/kubernetes/client/dsl/internal/MutatingWebhookConfigurationOperationsImpl.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, DoneableMutatingWebhookConfiguration, Resource<MutatingWebhookConfiguration, DoneableMutatingWebhookConfiguration>> {
+
+  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/...sts/src/test/java/io/fabric8/kubernetes/client/mock/MutatingWebhookConfigurationTest.java b/...sts/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);
+  }
+}