Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MGDSTRM-10781 adding a jsonproperty as a hint to the crd generator #872

Merged
merged 3 commits into from
Mar 2, 2023
Merged

MGDSTRM-10781 adding a jsonproperty as a hint to the crd generator #872

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfd4d0a
MGDSTRM-10781 adding a jsonproperty as a hint to the crd generator
shawkins Feb 27, 2023
b10822f
MGDSTRM-10781 using the project bundle for the test
shawkins Feb 28, 2023
a5fa5bb
switching to the latest import plugin to hopefully address a build issue
shawkins Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/org/bf2/operator/resources/v1alpha1/NetworkConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.bf2.operator.resources.v1alpha1;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.sundr.builder.annotations.Buildable;
import lombok.EqualsAndHashCode;
import lombok.Getter;
Expand All @@ -19,5 +20,6 @@
@Setter
@Accessors(prefix = "_")
public class NetworkConfiguration {
@JsonProperty("private")
private boolean _private;
}
59 changes: 40 additions & 19 deletions bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,32 +64,53 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!--
Set dependency paths as properties to make operator and sync bundle metadata artifacts
available to bundle generator.
-->
<execution>
<id>define-dependency-properties</id>
<goals>
<goal>properties</goal>
</goals>
<configuration>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<kas.bundle.operator-archive>${kas.bundle.operator-archive}</kas.bundle.operator-archive>
<kas.bundle.sync-archive>${kas.bundle.sync-archive}</kas.bundle.sync-archive>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>generate-bundle</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!--
Set dependency paths as properties to make operator and sync bundle metadata artifacts
available to bundle generator.
-->
<execution>
<id>define-dependency-properties</id>
<goals>
<goal>properties</goal>
</goals>
<configuration>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions bundle/src/main/java/org/bf2/kas/fleetshard/bundle/BundleAssembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -254,7 +255,7 @@ void mergeClusterServiceVersions() throws IOException {
ClusterServiceVersion operatorCsv = operatorBundle.readResource("manifests/kas-fleetshard-operator.clusterserviceversion.yaml");

operatorCsv.getMetadata().setName("kas-fleetshard-operator.v" + version);
operatorCsv.getMetadata().setAnnotations(new HashMap<>());
operatorCsv.getMetadata().setAnnotations(new LinkedHashMap<>());
operatorCsv.getMetadata().getAnnotations().put("olm.skipRange", ">=0.0.1 <" + version);
operatorCsv.getMetadata().getAnnotations().put("alm-examples", JSON_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(almExamples));

Expand Down Expand Up @@ -318,7 +319,7 @@ void buildAndPushImage() throws InvalidImageReferenceException, InterruptedExcep
.map(retrieverFactory::dockerConfig))
.orElseGet(retrieverFactory::dockerConfig);

Map<String, String> bundleAnnotations = new HashMap<>();
Map<String, String> bundleAnnotations = new LinkedHashMap<>();

YAML_MAPPER.readTree(operatorBundle.getEntry(ANNOTATIONS_PATH))
.get("annotations")
Expand Down
14 changes: 8 additions & 6 deletions bundle/src/test/java/org/bf2/kas/fleetshard/bundle/BundleAssemblerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.fabric8.kubernetes.client.utils.IOHelpers;
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.json.JSONException;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.skyscreamer.jsonassert.JSONCompareMode;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
Expand All @@ -40,8 +43,6 @@ void testAssembler() throws Exception {
Path bundleTar = testBundle.resolve("bundle.tar");

System.setProperty("kas.bundle.output-directory", testBundle.toAbsolutePath().toString());
System.setProperty("kas.bundle.operator-archive", targetPath.resolve("test-classes/operator-archive").toString());
System.setProperty("kas.bundle.sync-archive", targetPath.resolve("test-classes/sync-archive").toString());
System.setProperty("kas.bundle.version", "1.2.3");
System.setProperty("kas.bundle.image", "bf2/kas-fleetshard-operator-bundle:1.2.3");
System.setProperty("kas.bundle.tar-image", bundleTar.toString());
Expand Down Expand Up @@ -78,9 +79,10 @@ void testAssembler() throws Exception {
try {
String expected = Files.readString(file);
String actual = new String(layerEntries.get(expectedBundle.relativize(file).toString()), StandardCharsets.UTF_8);
assertEquals(expected, actual);
} catch (IOException e) {
throw new UncheckedIOException(e);

JSONAssert.assertEquals(IOHelpers.convertYamlToJson(expected), IOHelpers.convertYamlToJson(actual), JSONCompareMode.NON_EXTENSIBLE);
} catch (IOException | JSONException e) {
throw new RuntimeException(e);
}
});
}
Expand Down
12 changes: 6 additions & 6 deletions ...st/resources/expected-bundle/manifests/kas-fleetshard-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ metadata:
spec:
customresourcedefinitions:
owned:
- kind: ManagedKafka
name: managedkafkas.managedkafka.bf2.org
version: v1alpha1
- kind: ManagedKafkaAgent
name: managedkafkaagents.managedkafka.bf2.org
version: v1alpha1
- kind: ManagedKafka
name: managedkafkas.managedkafka.bf2.org
version: v1alpha1
description: Operator That Manages Kafka Instances
displayName: KaaS Fleetshard Operator
install:
Expand Down Expand Up @@ -275,7 +275,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/bf2fc6cc711aee1a0c2a82e312df7f2e6b37baa12bd9b1f2fd752e260d93a6f8144ac730947f25caa2bfe6ad0f410da360940ee6d28d6c1688d3822c4055650e/kas-fleetshard-operator:latest
image: kas-fleetshard-operator
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -343,7 +343,7 @@ spec:
value: prod
- name: QUARKUS_KUBERNETES_CONFIG_ENABLED
value: "true"
image: quay.io/bf2fc6cc711aee1a0c2a82e312df7f2e6b37baa12bd9b1f2fd752e260d93a6f8144ac730947f25caa2bfe6ad0f410da360940ee6d28d6c1688d3822c4055650e/kas-fleetshard-sync:latest
image: kas-fleetshard-sync
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -424,4 +424,4 @@ spec:
provider:
name: bf2 community
url: https://github.com/bf2fc6cc711aee1a0c2a/kas-fleetshard
version: 1.2.3
version: 1.2.3
2 changes: 1 addition & 1 deletion ...st/resources/expected-bundle/manifests/managedkafkaagents.managedkafka.bf2.org-v1.crd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
type: object
net:
properties:
_private:
private:
type: boolean
type: object
required:
Expand Down
Loading