Skip to content

Commit

Permalink
Bump CRD version to v1beta1 (#150)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicoloboschi
nicoloboschi authored Aug 30, 2023
1 parent e0be084 commit 3881152
Show file tree
Hide file tree
Showing 26 changed files with 85 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-release-operator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ jobs:
- uses: ncipollo/release-action@v1
with:
artifacts: "migration-tool/target/kaap-migration-tool-*.jar"
artifacts: "migration-tool/target/kaap-migration-tool-*.jar,helm/kaap/crds/*.yml"
token: ${{ secrets.GITHUB_TOKEN }}
generateReleaseNotes: true
22 changes: 17 additions & 5 deletions docs/api-reference.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Packages:

- [kaap.oss.datastax.com/v1alpha1](#kaapossdatastaxcomv1alpha1)
- [kaap.oss.datastax.com/v1beta1](#kaapossdatastaxcomv1beta1)

# kaap.oss.datastax.com/v1alpha1
# kaap.oss.datastax.com/v1beta1

Resource Types:

Expand Down Expand Up @@ -33,7 +33,7 @@ Resource Types:
<tbody><tr>
<td><b>apiVersion</b></td>
<td>string</td>
<td>kaap.oss.datastax.com/v1alpha1</td>
<td>kaap.oss.datastax.com/v1beta1</td>
<td>true</td>
</tr>
<tr>
Expand Down Expand Up @@ -55952,7 +55952,13 @@ Update strategy for the StatefulSet.
<td><b><a href="#pulsarclusterspecglobaldnsconfig">dnsConfig</a></b></td>
<td>object</td>
<td>
DNS config for each pod.<br/>
Override default DNS config for each pod. Note that because we use fully qualified service names for intra
cluster networking with Pulsar components, we set the ndots value to 4 (the default is 5). This prevents
unnecessary DNS lookups for the fully qualified service names that would be guaranteed to result in NXDOMAIN.
For example, the name 'pulsar-broker.pulsar.svc.cluster.local' has 4 dots, so it would be resolved directly
instead of appending the configured search domains.
More info here: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config.
<br/>
</td>
<td>false</td>
</tr><tr>
Expand Down Expand Up @@ -56315,7 +56321,13 @@ Pulsar cluster components names.



DNS config for each pod.
Override default DNS config for each pod. Note that because we use fully qualified service names for intra
cluster networking with Pulsar components, we set the ndots value to 4 (the default is 5). This prevents
unnecessary DNS lookups for the fully qualified service names that would be guaranteed to result in NXDOMAIN.
For example, the name 'pulsar-broker.pulsar.svc.cluster.local' has 4 dots, so it would be resolved directly
instead of appending the configured search domains.
More info here: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config.


<table>
<thead>
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/autorecoveries.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: autorecovery
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/bastions.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: bastion
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/bookkeepers.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: bookkeeper
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/brokers.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: broker
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/functionsworkers.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
singular: functionsworker
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/proxies.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: proxy
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/pulsarclusters.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: pulsarcluster
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/crds/zookeepers.kaap.oss.datastax.com-v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: zookeeper
scope: Namespaced
versions:
- name: v1alpha1
- name: v1beta1
schema:
openAPIV3Schema:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/kaap/templates/pulsar-cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

{{- if .Values.cluster.create }}
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
metadata:
name: {{ .Values.cluster.spec.global.name | quote }}
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/com/datastax/oss/kaap/migrationtool/PulsarClusterResourceGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private void assertValue(File tmpDir) {
SerializationUtil.writeAsYaml(pulsarCluster),
"""
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
metadata:
name: pulsar-cluster
Expand Down
2 changes: 1 addition & 1 deletion olm/examples/dev-cluster/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
metadata:
name: pulsar
Expand Down
2 changes: 1 addition & 1 deletion operator/src/main/java/com/datastax/oss/kaap/crds/CRDConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package com.datastax.oss.kaap.crds;

public final class CRDConstants {
public static final String VERSION = "v1alpha1";
public static final String VERSION = "v1beta1";
public static final String GROUP = "kaap.oss.datastax.com";

public static final String LABEL_APP = "app";
Expand Down
4 changes: 2 additions & 2 deletions operator/src/test/java/com/datastax/oss/kaap/autoscaler/BookKeeperAutoscalerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void start() {
server.expect()
.get()
.withPath(
"/apis/kaap.oss.datastax.com/v1alpha1/namespaces/ns/bookkeepers/%s-bookkeeper".formatted(
"/apis/kaap.oss.datastax.com/v1beta1/namespaces/ns/bookkeepers/%s-bookkeeper".formatted(
clusterSpecName))
.andReturn(HttpURLConnection.HTTP_OK, bkCr)
.times(2);
Expand Down Expand Up @@ -225,7 +225,7 @@ void start() {
server.expect()
.patch()
.withPath(
"/apis/kaap.oss.datastax.com/v1alpha1/namespaces/ns/bookkeepers/%s-bookkeeper".formatted(
"/apis/kaap.oss.datastax.com/v1beta1/namespaces/ns/bookkeepers/%s-bookkeeper".formatted(
clusterSpecName))
.andReply(HttpURLConnection.HTTP_OK, new BodyProvider<Object>() {
@Override
Expand Down
4 changes: 2 additions & 2 deletions operator/src/test/java/com/datastax/oss/kaap/autoscaler/BrokerAutoscalerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void start() {

server.expect()
.get()
.withPath("/apis/kaap.oss.datastax.com/v1alpha1/namespaces/ns/brokers/%s-broker".formatted(
.withPath("/apis/kaap.oss.datastax.com/v1beta1/namespaces/ns/brokers/%s-broker".formatted(
clusterSpecName))
.andReturn(HttpURLConnection.HTTP_OK, brokerCr)
.times(2);
Expand Down Expand Up @@ -207,7 +207,7 @@ void start() {

server.expect()
.patch()
.withPath("/apis/kaap.oss.datastax.com/v1alpha1/namespaces/ns/brokers/%s-broker".formatted(
.withPath("/apis/kaap.oss.datastax.com/v1beta1/namespaces/ns/brokers/%s-broker".formatted(
clusterSpecName))
.andReply(HttpURLConnection.HTTP_OK, new BodyProvider<Object>() {
@Override
Expand Down
28 changes: 14 additions & 14 deletions operator/src/test/java/com/datastax/oss/kaap/controllers/PulsarClusterControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,13 @@ public void testInstallCluster() throws Exception {
private void assertFnWorkerYaml(MockKubernetesClient client) {
Assert.assertEquals(client.getCreatedResource(FunctionsWorker.class).getResourceYaml(), """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: FunctionsWorker
metadata:
name: pulsar-spec-1-functionsworker
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -347,13 +347,13 @@ private void assertFnWorkerYaml(MockKubernetesClient client) {
private void assertBastionYaml(MockKubernetesClient client) {
Assert.assertEquals(client.getCreatedResource(Bastion.class).getResourceYaml(), """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: Bastion
metadata:
name: pulsar-spec-1-bastion
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand All @@ -378,13 +378,13 @@ private void assertBastionYaml(MockKubernetesClient client) {
private void assertAutorecoveryYaml(MockKubernetesClient client) {
Assert.assertEquals(client.getCreatedResource(Autorecovery.class).getResourceYaml(), """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: Autorecovery
metadata:
name: pulsar-spec-1-autorecovery
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand All @@ -408,13 +408,13 @@ private void assertAutorecoveryYaml(MockKubernetesClient client) {
private void assertProxyYaml(MockKubernetesClient client) {
Assert.assertEquals(client.getCreatedResource(Proxy.class).getResourceYaml(), """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: Proxy
metadata:
name: pulsar-spec-1-proxy
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -471,13 +471,13 @@ private void assertProxyYaml(MockKubernetesClient client) {
private void assertBrokerYaml(MockKubernetesClient client) {
Assert.assertEquals(client.getCreatedResource(Broker.class).getResourceYaml(), """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: Broker
metadata:
name: pulsar-spec-1-broker
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -537,13 +537,13 @@ private void assertBrokerYaml(MockKubernetesClient client) {
private void assertBkYaml(String yaml) {
Assert.assertEquals(yaml, """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: BookKeeper
metadata:
name: pulsar-spec-1-bookkeeper
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -608,13 +608,13 @@ private void assertBkYaml(String yaml) {
private void assertZkYaml(String yaml) {
Assert.assertEquals(yaml, """
---
apiVersion: kaap.oss.datastax.com/v1alpha1
apiVersion: kaap.oss.datastax.com/v1beta1
kind: ZooKeeper
metadata:
name: pulsar-spec-1-zookeeper
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: PulsarCluster
blockOwnerDeletion: true
controller: true
Expand Down
4 changes: 2 additions & 2 deletions .../test/java/com/datastax/oss/kaap/controllers/autorecovery/AutorecoveryControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-autorecovery
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: Autorecovery
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -104,7 +104,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-autorecovery
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: Autorecovery
blockOwnerDeletion: true
controller: true
Expand Down
4 changes: 2 additions & 2 deletions operator/src/test/java/com/datastax/oss/kaap/controllers/bastion/BastionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-bastion
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: Bastion
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -106,7 +106,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-bastion
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: Bastion
blockOwnerDeletion: true
controller: true
Expand Down
8 changes: 4 additions & 4 deletions .../src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-bookkeeper
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: BookKeeper
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -128,7 +128,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-bookkeeper
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: BookKeeper
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -160,7 +160,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-bookkeeper
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: BookKeeper
blockOwnerDeletion: true
controller: true
Expand Down Expand Up @@ -305,7 +305,7 @@ public void testDefaults() throws Exception {
name: pulsar-spec-1-bookkeeper
namespace: ns
ownerReferences:
- apiVersion: kaap.oss.datastax.com/v1alpha1
- apiVersion: kaap.oss.datastax.com/v1beta1
kind: BookKeeper
blockOwnerDeletion: true
controller: true
Expand Down
Loading

0 comments on commit 3881152

Please sign in to comment.