fix(operator): use a correct tag in the install file, other small fixes

.github/workflows/operator.yaml

@@ -111,13 +111,13 @@ jobs:
           unset IMAGE
           unset BUNDLE_IMAGE
           unset CATALOG_IMAGE
-          make INSTALL_FILE=install/install.yaml dist-install-file
+          make IMAGE_TAG=latest-snapshot INSTALL_FILE=install/install.yaml dist-install-file
 
       - name: Check install file
         run: |
           git add operator/install/install.yaml || true
           if ! git diff --staged --exit-code; then
-            echo 'Install file needs to be updated. Please run "cd operator; make SKIP_TESTS=true build INSTALL_FILE=install/install.yaml dist-install-file" and commit the result.';
+            echo 'Install file needs to be updated. Please run "cd operator; make SKIP_TESTS=true build IMAGE_TAG=latest-snapshot INSTALL_FILE=install/install.yaml dist-install-file" and commit the result.';
             exit 1;
           else
             echo "No changes to the install file.";            

operator/README.md

@@ -41,7 +41,7 @@ OpenShift). Alternatively, you can use the following steps:
 4. Run:
    ```shell
    curl -sSL "https://raw.githubusercontent.com/Apicurio/apicurio-registry/$VERSION/operator/install/install.yaml" | sed "s/PLACEHOLDER_NAMESPACE/$NAMESPACE/g" | kubectl -n $NAMESPACE apply -f -
-   kubectl -n $NAMESPACE apply -f controller/src/main/deploy/examples/simple-apicurioregistry3.yaml
+   kubectl -n $NAMESPACE apply -f controller/src/main/deploy/examples/simple.apicurioregistry3.yaml
    ```
 
 ### Local Development Quickstart

operator/controller/src/main/java/io/apicurio/registry/operator/feat/PostgresSql.java

@@ -18,8 +18,8 @@ public class PostgresSql {
 
     public static boolean configureDatasource(ApicurioRegistry3 primary, Map<String, EnvVar> env) {
         if (primary.getSpec().getApp().getSql() != null
-                && primary.getSpec().getApp().getSql().getDatasource() != null) {
-            var datasource = primary.getSpec().getApp().getSql().getDatasource();
+                && primary.getSpec().getApp().getSql().getDataSource() != null) {
+            var datasource = primary.getSpec().getApp().getSql().getDataSource();
 
             addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_STORAGE_KIND).withValue("sql").build());
             addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_STORAGE_SQL_KIND).withValue("postgresql")

operator/controller/src/test/java/io/apicurio/registry/operator/it/SqlDatasourceITTest.java → operator/controller/src/test/java/io/apicurio/registry/operator/it/SqlDataSourceITTest.java

@@ -2,7 +2,7 @@
 
 import io.apicurio.registry.operator.api.v1.ApicurioRegistry3;
 import io.apicurio.registry.operator.api.v1.spec.Sql;
-import io.apicurio.registry.operator.api.v1.spec.sql.Datasource;
+import io.apicurio.registry.operator.api.v1.spec.sql.DataSource;
 import io.apicurio.registry.operator.resource.ResourceFactory;
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
@@ -13,14 +13,14 @@
 import static org.awaitility.Awaitility.await;
 
 @QuarkusTest
-public class SqlDatasourceITTest extends ITBase {
+public class SqlDataSourceITTest extends ITBase {
 
-    private static final Logger log = LoggerFactory.getLogger(SqlDatasourceITTest.class);
+    private static final Logger log = LoggerFactory.getLogger(SqlDataSourceITTest.class);
 
     @Test
     void testSqlDatasource() {
         client.load(
-                SqlDatasourceITTest.class.getResourceAsStream("/k8s/examples/postgres/example-postgres.yaml"))
+                SqlDataSourceITTest.class.getResourceAsStream("/k8s/examples/postgres/example-postgres.yaml"))
                 .create();
         // await for postgres to be available
         await().ignoreExceptions().until(() -> (1 == client.apps().statefulSets().inNamespace(namespace)
@@ -31,8 +31,8 @@ void testSqlDatasource() {
         registry.getMetadata().setNamespace(namespace);
         var sql = new Sql();
         registry.getSpec().getApp().setSql(sql);
-        var datasource = new Datasource();
-        sql.setDatasource(datasource);
+        var datasource = new DataSource();
+        sql.setDataSource(datasource);
         datasource.setUrl("jdbc:postgresql://postgres-db:5432/apicurio");
         datasource.setUsername("postgres-username");
         datasource.setPassword("postgres-password");

operator/install/install.yaml

@@ -3012,7 +3012,7 @@ spec:
                   sql:
                     description: Configuration of Apicurio Registry SQL storage.
                     properties:
-                      datasource:
+                      dataSource:
                         description: SQL data source.
                         properties:
                           password:
@@ -9184,7 +9184,7 @@ spec:
           value: quay.io/apicurio/apicurio-registry-ui:latest-snapshot
         - name: STUDIO_UI_IMAGE
           value: quay.io/apicurio/apicurio-studio-ui:latest-snapshot
-        image: quay.io/apicurio/apicurio-registry-operator:3.0.5-snapshot
+        image: quay.io/apicurio/apicurio-registry-operator:latest-snapshot
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

operator/model/src/main/java/io/apicurio/registry/operator/api/v1/spec/Sql.java

@@ -8,23 +8,23 @@
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.apicurio.registry.operator.api.v1.spec.sql.Datasource;
+import io.apicurio.registry.operator.api.v1.spec.sql.DataSource;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "datasource" })
+@JsonPropertyOrder({ "dataSource" })
 @JsonDeserialize(using = JsonDeserializer.None.class)
 @Getter
 @Setter
 @ToString
 public class Sql {
 
-    @JsonProperty("datasource")
+    @JsonProperty("dataSource")
     @JsonPropertyDescription("""
             SQL data source.""")
     @JsonSetter(nulls = Nulls.SKIP)
-    private Datasource datasource;
+    private DataSource dataSource;
 
 }

operator/model/src/main/java/io/apicurio/registry/operator/api/v1/spec/sql/Datasource.java → operator/model/src/main/java/io/apicurio/registry/operator/api/v1/spec/sql/DataSource.java

@@ -18,7 +18,7 @@
 @Getter
 @Setter
 @ToString
-public class Datasource {
+public class DataSource {
 
     @JsonProperty("url")
     @JsonPropertyDescription("""