Skip to content

Commit

Permalink
Add DSL Support for apps/v1#ControllerRevision resource
Browse files Browse the repository at this point in the history
Related to #2912
  • Loading branch information
rohanKanojia authored and manusa committed Apr 16, 2021
1 parent b91fd7e commit 64cc3b0
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* Update Kubernetes Model to v1.21.0

#### New Features
* Add DSL Support for `apps/v1#ControllerRevision` resource


#### _**Note**_: Breaking changes in the API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package io.fabric8.kubernetes.client;

import io.fabric8.kubernetes.api.model.apps.ControllerRevision;
import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList;
import io.fabric8.kubernetes.api.model.apps.DaemonSet;
import io.fabric8.kubernetes.api.model.apps.DaemonSetList;
import io.fabric8.kubernetes.api.model.apps.Deployment;
Expand All @@ -27,6 +29,7 @@
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.AppsAPIGroupDSL;
import io.fabric8.kubernetes.client.dsl.internal.apps.v1.ControllerRevisionOperationsImpl;
import io.fabric8.kubernetes.client.dsl.internal.apps.v1.DaemonSetOperationsImpl;
import io.fabric8.kubernetes.client.dsl.internal.apps.v1.DeploymentOperationsImpl;
import io.fabric8.kubernetes.client.dsl.internal.apps.v1.ReplicaSetOperationsImpl;
Expand Down Expand Up @@ -63,4 +66,9 @@ public MixedOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<Repli
public MixedOperation<StatefulSet, StatefulSetList, RollableScalableResource<StatefulSet>> statefulSets() {
return new StatefulSetOperationsImpl(httpClient, getConfiguration());
}

@Override
public MixedOperation<ControllerRevision, ControllerRevisionList, Resource<ControllerRevision>> controllerRevisions() {
return new ControllerRevisionOperationsImpl(httpClient, getConfiguration());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package io.fabric8.kubernetes.client.dsl;

import io.fabric8.kubernetes.api.model.apps.ControllerRevision;
import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList;
import io.fabric8.kubernetes.api.model.apps.DaemonSet;
import io.fabric8.kubernetes.api.model.apps.DaemonSetList;
import io.fabric8.kubernetes.api.model.apps.Deployment;
Expand All @@ -36,4 +38,11 @@ public interface AppsAPIGroupDSL extends Client {

MixedOperation<StatefulSet, StatefulSetList, RollableScalableResource<StatefulSet>> statefulSets();

/**
* DSL entrypoint for ControllerRevision in api group apps/v1
*
* @return {@link MixedOperation} for ControllerRevision resource
*/
MixedOperation<ControllerRevision, ControllerRevisionList, Resource<ControllerRevision>> controllerRevisions();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/**
* 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.apps.ControllerRevision;
import io.fabric8.kubernetes.api.model.apps.ControllerRevisionBuilder;
import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList;
import io.fabric8.kubernetes.api.model.apps.ControllerRevisionListBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import org.junit.jupiter.api.Test;

import java.net.HttpURLConnection;
import java.util.List;

import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;

@EnableKubernetesMockClient
class ControllerRevisionTest {
private KubernetesMockServer server;
private KubernetesClient client;

@Test
void load() {
List<HasMetadata> items = client.load(getClass().getResourceAsStream("/test-controllerrevision.yml")).get();
assertThat(items).isNotNull().hasSize(1);
assertThat(items.get(0)).isInstanceOf(ControllerRevision.class);
}

@Test
void create() {
// Given
ControllerRevision controllerRevision = getMockControllerRevision("my-cr1");
server.expect().post().withPath("/apis/apps/v1/namespaces/default/controllerrevisions")
.andReturn(HttpURLConnection.HTTP_CREATED, controllerRevision)
.once();

// When
ControllerRevision myCr = client.apps().controllerRevisions().inNamespace("default").create(controllerRevision);

// Then
assertThat(myCr).isNotNull().hasFieldOrPropertyWithValue("metadata.name", "my-cr1");
}

@Test
void get() {
// Given
server.expect().get().withPath("/apis/apps/v1/namespaces/default/controllerrevisions/cr1")
.andReturn(HttpURLConnection.HTTP_OK, getMockControllerRevision("cr1"))
.once();

// When
ControllerRevision cr1 = client.apps().controllerRevisions().inNamespace("default").withName("cr1").get();

// Then
assertThat(cr1)
.isNotNull()
.hasFieldOrPropertyWithValue("metadata.name", "cr1");
}

@Test
void list() {
// Given
server.expect().get().withPath("/apis/apps/v1/namespaces/default/controllerrevisions")
.andReturn(HttpURLConnection.HTTP_OK, new ControllerRevisionListBuilder().addToItems(getMockControllerRevision("cr1")).build())
.once();

// When
ControllerRevisionList controllerRevisionList = client.apps().controllerRevisions().inNamespace("default").list();

// Then
assertThat(controllerRevisionList).isNotNull();
assertThat(controllerRevisionList.getItems()).isNotNull().hasSize(1);
assertThat(controllerRevisionList.getItems().get(0)).hasFieldOrPropertyWithValue("metadata.name", "cr1");
}

@Test
void delete() {
// Given
server.expect().delete().withPath("/apis/apps/v1/namespaces/default/controllerrevisions/cr1")
.andReturn(HttpURLConnection.HTTP_OK, getMockControllerRevision("cr1"))
.once();

// When
Boolean isDeleted = client.apps().controllerRevisions().inNamespace("default").withName("cr1").delete();

// Then
assertThat(isDeleted).isTrue();
}

private ControllerRevision getMockControllerRevision(String name) {
return new ControllerRevisionBuilder()
.withNewMetadata().withName(name).endMetadata()
.withNewDaemonSetData()
.withApiVersion("apps/v1")
.withKind("DaemonSet")
.endDaemonSetData()
.build();
}

}
23 changes: 23 additions & 0 deletions kubernetes-tests/src/test/resources/test-controllerrevision.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# 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.
#

apiVersion: apps/v1
kind: ControllerRevision
metadata:
name: example
data:
key: value
revision: 1

0 comments on commit 64cc3b0

Please sign in to comment.