Upgrade to OpenDaylight Scandium

Update parent versions and base images to build OpenDaylight
Scandium base image and ODLSLI image.

Issue-ID: CCSDK-4116
Change-Id: I796f270e8c481f39563f5224570bce0aa529b160
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/alpine/pom.xml b/alpine/pom.xml
index 5adc3e3..50160c6 100644 (file)
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -59,7 +59,7 @@
                                 <resource>
                                     <directory>src/main/docker</directory>
                                     <includes>
-                                        <include>Dockerfile</include>
+                                        <include>*.Dockerfile</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
@@ -101,59 +101,65 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.39.0</version>
+                        <version>0.46.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
                                 <image>
                                     <name>${alpinej21.image.name}</name>
                                     <build>
+                                        <buildx>
+                                            <platforms>
+                                                <platform>${docker.platforms}</platform>
+                                            </platforms>
+                                        </buildx>
                                         <cleanup>try</cleanup>
                                         <noCache>true</noCache>
                                         <contextDir>${basedir}/target/docker-stage</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
+                                        <dockerFile>java21.Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
                                             <tag>${project.docker.latestfulltag.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
-                                        <args>
-                                            <OPENJDK_IMAGE_VERSION>${openjdk21.image.version}</OPENJDK_IMAGE_VERSION>   
-                                        </args>
                                     </build>
                                 </image>
                                 <image>
                                     <name>${alpinej17.image.name}</name>
                                     <build>
+                                        <buildx>
+                                            <platforms>
+                                                <platform>${docker.platforms}</platform>
+                                            </platforms>
+                                        </buildx>
                                         <cleanup>try</cleanup>
                                         <noCache>true</noCache>
                                         <contextDir>${basedir}/target/docker-stage</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
+                                        <dockerFile>java17.Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
                                             <tag>${project.docker.latestfulltag.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
-                                        <args>
-                                            <OPENJDK_IMAGE_VERSION>${openjdk17.image.version}</OPENJDK_IMAGE_VERSION>   
-                                        </args>
                                     </build>
                                 </image>
                                 <image>
                                     <name>${alpinej11.image.name}</name>
                                     <build>
+                                        <buildx>
+                                            <platforms>
+                                                <platform>${docker.platforms}</platform>
+                                            </platforms>
+                                        </buildx>
                                         <cleanup>try</cleanup>
                                         <noCache>true</noCache>
                                         <contextDir>${basedir}/target/docker-stage</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
+                                        <dockerFile>java11.Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
                                             <tag>${project.docker.latestfulltag.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
-                                        <args>
-                                            <OPENJDK_IMAGE_VERSION>${openjdk11.image.version}</OPENJDK_IMAGE_VERSION>   
-                                        </args>
                                     </build>
                                 </image>
                             </images>

diff --git a/alpine/src/main/docker/Dockerfile b/alpine/src/main/docker/java11.Dockerfile
similarity index 96%
rename from alpine/src/main/docker/Dockerfile
rename to alpine/src/main/docker/java11.Dockerfile
index 7e12192..131aa9e 100644 (file)
--- a/alpine/src/main/docker/Dockerfile
+++ b/alpine/src/main/docker/java11.Dockerfile
@@ -1,6 +1,6 @@
 # Base alpine with added packages needed for open ecomp
 ARG OPENJDK_IMAGE_VERSION
-FROM ${openjdk.image}:${OPENJDK_IMAGE_VERSION}
+FROM ${openjdk.image}:${openjdk11.image.version}
 
 LABEL maintainer="ONAP CCSDK team"
 LABEL Description="Reference CCSDK JAVA image based on alpine"

diff --git a/alpine/src/main/docker/java17.Dockerfile b/alpine/src/main/docker/java17.Dockerfile
new file mode 100644 (file)
index 0000000..a43e94e
--- /dev/null
+++ b/alpine/src/main/docker/java17.Dockerfile
@@ -0,0 +1,47 @@
+# Base alpine with added packages needed for open ecomp
+ARG OPENJDK_IMAGE_VERSION
+FROM ${openjdk.image}:${openjdk17.image.version}
+
+LABEL maintainer="ONAP CCSDK team"
+LABEL Description="Reference CCSDK JAVA image based on alpine"
+
+# Explicitly become root during build phase
+USER root
+
+ENV JAVA_OPTS="-Xms256m -Xmx1g"
+ENV JAVA_SEC_OPTS=""
+
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG user=onap
+ARG group=onap
+
+# Install additional tools
+RUN apk add --no-cache openssl ca-certificates
+
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
+
+# Add additional packages if defined
+RUN test -n "${openjdk.additional.packages}" && \
+    export http_proxy=${HTTP_PROXY} && export https_proxy=${HTTP_PROXY} && \
+    export HTTP_PROXY=${HTTP_PROXY} && export HTTPS_PROXY=${HTTP_PROXY} && \
+    apk update && \
+    apk --no-cache add ${openjdk.additional.packages} && \
+    unset http_proxy && unset https_proxy && unset HTTP_PROXY && unset HTTPS_PROXY \
+    || echo "No additional packages to install"
+
+# Create a group and user
+RUN addgroup -S $group && adduser -G $group -D $user && \
+    mkdir /var/log/$user && \
+    mkdir /app && \
+    chown -R $user:$group /var/log/$user && \
+    chown -R $user:$group /app
+
+# Tell docker that all future commands should be run as the onap user
+USER $user
+WORKDIR /app
+
+ENTRYPOINT exec java $JAVA_SEC_OPTS $JAVA_OPTS -jar /app/app.jar

diff --git a/alpine/src/main/docker/java21.Dockerfile b/alpine/src/main/docker/java21.Dockerfile
new file mode 100644 (file)
index 0000000..1992845
--- /dev/null
+++ b/alpine/src/main/docker/java21.Dockerfile
@@ -0,0 +1,47 @@
+# Base alpine with added packages needed for open ecomp
+ARG OPENJDK_IMAGE_VERSION
+FROM ${openjdk.image}:${openjdk21.image.version}
+
+LABEL maintainer="ONAP CCSDK team"
+LABEL Description="Reference CCSDK JAVA image based on alpine"
+
+# Explicitly become root during build phase
+USER root
+
+ENV JAVA_OPTS="-Xms256m -Xmx1g"
+ENV JAVA_SEC_OPTS=""
+
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG user=onap
+ARG group=onap
+
+# Install additional tools
+RUN apk add --no-cache openssl ca-certificates
+
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
+
+# Add additional packages if defined
+RUN test -n "${openjdk.additional.packages}" && \
+    export http_proxy=${HTTP_PROXY} && export https_proxy=${HTTP_PROXY} && \
+    export HTTP_PROXY=${HTTP_PROXY} && export HTTPS_PROXY=${HTTP_PROXY} && \
+    apk update && \
+    apk --no-cache add ${openjdk.additional.packages} && \
+    unset http_proxy && unset https_proxy && unset HTTP_PROXY && unset HTTPS_PROXY \
+    || echo "No additional packages to install"
+
+# Create a group and user
+RUN addgroup -S $group && adduser -G $group -D $user && \
+    mkdir /var/log/$user && \
+    mkdir /app && \
+    chown -R $user:$group /var/log/$user && \
+    chown -R $user:$group /app
+
+# Tell docker that all future commands should be run as the onap user
+USER $user
+WORKDIR /app
+
+ENTRYPOINT exec java $JAVA_SEC_OPTS $JAVA_OPTS -jar /app/app.jar

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 904ae5d..0f251b8 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -15,6 +15,7 @@
 
     <properties>
         <include.transitive.dependencies>false</include.transitive.dependencies>
+        <logback.version>1.2.11</logback.version>
     </properties>
 
     <dependencyManagement>
@@ -22,7 +23,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -85,6 +86,11 @@
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
+
         <!-- Below provides javax.jws -->
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
@@ -98,7 +104,10 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
@@ -212,15 +221,20 @@
             <groupId>com.google.guava</groupId>
             <artifactId>listenablefuture</artifactId>
         </dependency>
+        <!-- Kafka Dependency -->
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.24.0</version>
+            <version>2.36.0</version>
         </dependency>
-        <!-- Kafka Dependency -->
         <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
             <version>3.0.0</version>
         </dependency>
     </dependencies>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 112016f..1c659fc 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -18,7 +18,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-potassium-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-scandium-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
@@ -225,6 +225,7 @@
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
+        <!--
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restconf-client-installer</artifactId>
@@ -232,6 +233,7 @@
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
+        -->
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sshapi-call-node-installer</artifactId>

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 37f4024..9533330 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -15,8 +15,6 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>chlorine</module>
-        <module>argon</module>
-        <module>potassium</module>
+        <module>scandium</module>
     </modules>
 </project>

diff --git a/opendaylight/scandium/pom.xml b/opendaylight/scandium/pom.xml
new file mode 100644 (file)
index 0000000..edbbc81
--- /dev/null
+++ b/opendaylight/scandium/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-opendaylight</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odl-scandium</artifactId>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight :: scandium</name>
+    <description>Creates OpenDaylight container</description>
+
+    <modules>
+        <module>scandium-alpine</module>
+    </modules>
+
+    <properties>
+        <ccsdk.opendaylight.version>0.21.2</ccsdk.opendaylight.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.integration</groupId>
+                <artifactId>onap-karaf</artifactId>
+                <version>${ccsdk.opendaylight.version}</version>
+                <type>tar.gz</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>

diff --git a/opendaylight/scandium/scandium-alpine/pom.xml b/opendaylight/scandium/scandium-alpine/pom.xml
new file mode 100644 (file)
index 0000000..c5f3502
--- /dev/null
+++ b/opendaylight/scandium/scandium-alpine/pom.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-odl-scandium</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odl-scandium-alpine</artifactId>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight :: scandium :: docker</name>
+    <description>Creates OpenDaylight container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
+
+    <properties>
+        <image.name>onap/ccsdk-odl-scandium-alpine-image</image.name>
+        <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
+        <odl.shiro.version>0.18.4</odl.shiro.version>
+    </properties>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>get-odl-distribution</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.opendaylight.integration</groupId>
+                                    <artifactId>${odl.karaf.artifactId}</artifactId>
+                                    <version>${ccsdk.opendaylight.version}</version>
+                                    <type>tar.gz</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-with-alternalte-repo-2</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.aaa</groupId>
+                                    <artifactId>aaa-authn-api</artifactId>
+                                    <version>${odl.shiro.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
+                                    <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                                <resource>
+                                    <directory>src/main/odlscripts</directory>
+                                    <includes>
+                                        <include>*</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.39.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>build-push-images</id>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

diff --git a/opendaylight/scandium/scandium-alpine/src/main/docker/Dockerfile b/opendaylight/scandium/scandium-alpine/src/main/docker/Dockerfile
new file mode 100644 (file)
index 0000000..d18ffaa
--- /dev/null
+++ b/opendaylight/scandium/scandium-alpine/src/main/docker/Dockerfile
@@ -0,0 +1,53 @@
+# Prepare stage for multistage image build
+## START OF STAGE0 ##
+FROM onap/ccsdk-alpine-j21-image:${project.docker.latestfulltag.version} AS stage0
+USER root
+
+ENV ODL_HOME /opt/opendaylight/current
+
+# copy the opendaylight tar and expand
+COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
+RUN mkdir -p /opt/odl \
+    && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
+    && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
+    && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
+    && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
+    && ln -s /opt/opendaylight /opt/opendaylight/current
+
+# Enable wheel and create a group and user
+RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
+    && addgroup -S odl \
+    && adduser -S odl -G odl \
+    && addgroup odl wheel
+
+# Patch some opendaylight artifacts
+COPY system $ODL_HOME/system
+
+# Add missing scripts see SDNC-1056
+#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
+#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
+
+
+# Changing ownership and permission of /opt
+RUN chown -R odl:odl /opt && chmod -R 755 /opt
+
+## END OF STAGE0 ##
+
+#################################################
+
+## This will create actual image
+FROM scratch
+MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+USER root
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH=$PATH:/opt/java/openjdk/bin \
+    ODL_HOME=/opt/opendaylight/current
+
+# Copy Everything from stage0
+COPY --from=stage0 / /
+
+USER odl
+EXPOSE 8181
+WORKDIR $ODL_HOME
+# ENTRYPOINT exec /opt/opendaylight/bin/karaf