diff options
| author |   Avdhut Kholkar <avdhut.kholkar@amdocs.com> | 2018-01-30 05:09:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-01-30 05:09:47 +0000 |
| commit | 0e37f66b4d5c0ca76f402984531082936ce98b4f (patch) | |
| tree | e7a890907d73e11982c5031485bde4c26ddb2400 | |
| parent | 6fe98f991c599af431cd4ae5c10db13a384b8541 (diff) | |
| parent | 1f44731975d5a90d546bf5f4008f26920910ab8c (diff) | |
Merge "log RI kubernetes and docker devops"
20 files changed, 237 insertions, 41 deletions
@@ -0,0 +1,18 @@ +<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.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-analytics</artifactId> + <packaging>pom</packaging> + <version>1.2.0-SNAPSHOT</version> + <name>logging-analytics</name> + <url>http://maven.apache.org</url> + <modules> + <module>reference</module> + </modules> +</project> diff --git a/reference/.classpath b/reference/.classpath index e6312a8..1767a9d 100644 --- a/reference/.classpath +++ b/reference/.classpath @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="logging-demo/src/main/java"/> - <classpathentry kind="src" path="logging-library/src/main/java"/> - <classpathentry kind="src" path="logging-mock-service/src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="module" value="true"/> <attribute name="owner.project.facets" value="java"/> diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml index da22ff8..a695970 100644 --- a/reference/logging-demo/pom.xml +++ b/reference/logging-demo/pom.xml @@ -1,16 +1,13 @@ <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.logging</groupId> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-reference</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <artifactId>logging-demo</artifactId> <packaging>war</packaging> - <!-- version>1.2.0-SNAPSHOT</version--> <name>logging-demo</name> - <properties> <jackson-2-version>2.5.1</jackson-2-version> <spring.version>4.3.6.RELEASE</spring.version> @@ -72,12 +69,12 @@ </build> <dependencies> <dependency> - <groupId>org.onap.logging</groupId> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-library</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.onap.logging</groupId> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-mock-service</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> @@ -255,16 +252,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> <version>${spring.version}</version> - </dependency> - <!--dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-web</artifactId> - <version>${spring.security.version}</version> - </dependency--> - <!-- dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <version>${spring.boot.version}</version> - </dependency--> + </dependency> </dependencies> </project> diff --git a/reference/logging-docker-root/.project b/reference/logging-docker-root/.project new file mode 100644 index 0000000..f1679d2 --- /dev/null +++ b/reference/logging-docker-root/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>logging-docker-root</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/reference/logging-docker-root/logging-docker-demo/DockerFile b/reference/logging-docker-root/logging-docker-demo/DockerFile new file mode 100644 index 0000000..b3d68f0 --- /dev/null +++ b/reference/logging-docker-root/logging-docker-demo/DockerFile @@ -0,0 +1,2 @@ +FROM tomcat:8.0.48-jre8 +COPY target/logging-demo-1.2.0-SNAPSHOT.war /usr/local/tomcat/webapps/logging-demo.war diff --git a/reference/logging-docker-root/logging-docker-demo/build.sh b/reference/logging-docker-root/logging-docker-demo/build.sh new file mode 100755 index 0000000..d2e0ea2 --- /dev/null +++ b/reference/logging-docker-root/logging-docker-demo/build.sh @@ -0,0 +1,8 @@ +mkdir target +cp ../../logging-demo/target/*.war target +docker build -t oomk8s/logging-demo-nbi -f DockerFile . +docker images | grep logging-demo-nbi +docker tag oomk8s/logging-demo-nbi oomk8s/logging-demo-nbi:0.0.1 +docker login +docker push oomk8s/logging-demo-nbi:0.0.1 +#docker run -d -it --rm -p 8888:8080 oomk8s/logging-demo-nbi:latest diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml new file mode 100644 index 0000000..771856e --- /dev/null +++ b/reference/logging-docker-root/pom.xml @@ -0,0 +1,12 @@ +<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.logging-analytics</groupId> + <artifactId>logging-reference</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + <artifactId>logging-docker-root</artifactId> + <packaging>pom</packaging> + <name>logging-docker-root</name> +</project> diff --git a/reference/logging-kubernetes/.project b/reference/logging-kubernetes/.project new file mode 100644 index 0000000..a7ec855 --- /dev/null +++ b/reference/logging-kubernetes/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>logging-kubernetes</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/reference/logging-kubernetes/log-mock-demo/Chart.yaml b/reference/logging-kubernetes/log-mock-demo/Chart.yaml new file mode 100644 index 0000000..9c45fce --- /dev/null +++ b/reference/logging-kubernetes/log-mock-demo/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: logdemo +version: 0.1.0 diff --git a/reference/logging-kubernetes/log-mock-demo/templates/all-services.yaml b/reference/logging-kubernetes/log-mock-demo/templates/all-services.yaml new file mode 100644 index 0000000..9e4f694 --- /dev/null +++ b/reference/logging-kubernetes/log-mock-demo/templates/all-services.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: logdemo + name: logdemo + namespace: "{{ .Values.nsPrefix }}-logdemo" +spec: + ports: + - port: 8080 + nodePort: {{ .Values.nodePortPrefix }}99 + selector: + app: logdemo + type: NodePort diff --git a/reference/logging-kubernetes/log-mock-demo/templates/log-mock-demo-deployment.yaml b/reference/logging-kubernetes/log-mock-demo/templates/log-mock-demo-deployment.yaml new file mode 100644 index 0000000..afd513e --- /dev/null +++ b/reference/logging-kubernetes/log-mock-demo/templates/log-mock-demo-deployment.yaml @@ -0,0 +1,43 @@ +#{{ if not .Values.disableLogdemoLogdemo }} +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: logdemo + namespace: "{{ .Values.nsPrefix }}-logdemo" +spec: + selector: + matchLabels: + app: logdemo + template: + metadata: + labels: + app: logdemo + name: logdemo + spec: + containers: + - image: {{ .Values.image.logdemo }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: logdemo + volumeMounts: + - name: localtime + mountPath: /etc/localtime + readOnly: true + - name: logdemo-eteshare + mountPath: /share + ports: + - containerPort: 8080 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: logdemo-eteshare + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logdemo/eteshare + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} diff --git a/reference/logging-kubernetes/log-mock-demo/values.yaml b/reference/logging-kubernetes/log-mock-demo/values.yaml new file mode 100644 index 0000000..6d1adf7 --- /dev/null +++ b/reference/logging-kubernetes/log-mock-demo/values.yaml @@ -0,0 +1,7 @@ +nsPrefix: onap +pullPolicy: Always +nodePortPrefix: 302 +image: + readiness: oomk8s/readiness-check:1.0.0 + logdemo: obrienlabs/logging-demo-nbi:0.0.1 + filebeat: docker.elastic.co/beats/filebeat:5.5.0 diff --git a/reference/logging-kubernetes/logdemo/Chart.yaml b/reference/logging-kubernetes/logdemo/Chart.yaml new file mode 100644 index 0000000..9c45fce --- /dev/null +++ b/reference/logging-kubernetes/logdemo/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: logdemo +version: 0.1.0 diff --git a/reference/logging-kubernetes/logdemo/templates/all-services.yaml b/reference/logging-kubernetes/logdemo/templates/all-services.yaml new file mode 100644 index 0000000..9e4f694 --- /dev/null +++ b/reference/logging-kubernetes/logdemo/templates/all-services.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: logdemo + name: logdemo + namespace: "{{ .Values.nsPrefix }}-logdemo" +spec: + ports: + - port: 8080 + nodePort: {{ .Values.nodePortPrefix }}99 + selector: + app: logdemo + type: NodePort diff --git a/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml b/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml new file mode 100644 index 0000000..afd513e --- /dev/null +++ b/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml @@ -0,0 +1,43 @@ +#{{ if not .Values.disableLogdemoLogdemo }} +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: logdemo + namespace: "{{ .Values.nsPrefix }}-logdemo" +spec: + selector: + matchLabels: + app: logdemo + template: + metadata: + labels: + app: logdemo + name: logdemo + spec: + containers: + - image: {{ .Values.image.logdemo }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: logdemo + volumeMounts: + - name: localtime + mountPath: /etc/localtime + readOnly: true + - name: logdemo-eteshare + mountPath: /share + ports: + - containerPort: 8080 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: logdemo-eteshare + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logdemo/eteshare + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} diff --git a/reference/logging-kubernetes/logdemo/values.yaml b/reference/logging-kubernetes/logdemo/values.yaml new file mode 100644 index 0000000..53e3fc6 --- /dev/null +++ b/reference/logging-kubernetes/logdemo/values.yaml @@ -0,0 +1,7 @@ +nsPrefix: onap +pullPolicy: Always +nodePortPrefix: 302 +image: + readiness: oomk8s/readiness-check:1.0.0 + logdemo: oomk8s/logging-demo-nbi:0.0.1 + filebeat: docker.elastic.co/beats/filebeat:5.5.0 diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml new file mode 100644 index 0000000..6f32c54 --- /dev/null +++ b/reference/logging-kubernetes/pom.xml @@ -0,0 +1,12 @@ +<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.logging-analytics</groupId> + <artifactId>logging-reference</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + <artifactId>logging-kubernetes</artifactId> + <packaging>pom</packaging> + <name>logging-kubernetes</name> +</project> diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index 2bd9f6d..74e3a7c 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -1,16 +1,14 @@ <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.logging</groupId> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-reference</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>logging-library</artifactId> <packaging>jar</packaging> - <version>1.2.0-SNAPSHOT</version> <name>logging-library</name> - <build> <plugins> <plugin> diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml index 79f68af..7777b5a 100644 --- a/reference/logging-mock-service/pom.xml +++ b/reference/logging-mock-service/pom.xml @@ -1,16 +1,13 @@ <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.logging</groupId> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-reference</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - <artifactId>logging-mock-service</artifactId> <packaging>jar</packaging> - <version>1.2.0-SNAPSHOT</version> - <name>logging-mock-service</name> - + <name>logging-mock-service</name> <build> <plugins> <plugin> @@ -63,7 +60,7 @@ </properties> <dependencies> <dependency> - <groupId>org.onap.logging</groupId> + <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-library</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> diff --git a/reference/pom.xml b/reference/pom.xml index a52ff5f..b3f99ba 100644 --- a/reference/pom.xml +++ b/reference/pom.xml @@ -2,25 +2,20 @@ 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.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.1.0-SNAPSHOT</version> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-analytics</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> - - <groupId>org.onap.logging</groupId> <artifactId>logging-reference</artifactId> <packaging>pom</packaging> - <version>1.2.0-SNAPSHOT</version> <name>logging-reference</name> - - <url>http://maven.apache.org</url> - + <url>http://maven.apache.org</url> <modules> <module>logging-demo</module> <module>logging-library</module> <module>logging-mock-service</module> - <!--module>logging-demo-docker</module> - <module>logging-traffic-generator</module--> + <module>logging-docker-root</module> + <module>logging-kubernetes</module> </modules> <build> <pluginManagement> |