summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/values.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/values.yaml2
-rw-r--r--kubernetes/clamp/values.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml4
-rw-r--r--kubernetes/readiness/docker/init/Dockerfile10
-rw-r--r--kubernetes/readiness/docker/init/job_complete.py6
-rw-r--r--kubernetes/readiness/docker/init/ready.py6
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml1
-rw-r--r--kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml4
-rw-r--r--kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml4
10 files changed, 21 insertions, 20 deletions
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
index 13b868ab6f..9356c47522 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
@@ -34,7 +34,7 @@ busyboxImage: library/busybox:latest
# application image
repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-kibana:4.0-STAGING-latest
+image: onap/clamp-dashboard-kibana:4.0.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
index c81117ffd7..b3d93bb601 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
@@ -30,7 +30,7 @@ flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-logstash:4.0-STAGING-latest
+image: onap/clamp-dashboard-logstash:4.0.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index a806e77da8..f4c579b199 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -30,7 +30,7 @@ flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/clamp:4.0-STAGING-latest
+image: onap/clamp:4.0.1
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index 6c5bb9a3bd..19e55ace64 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -97,8 +97,8 @@ default_k8s_location: central
# Use to override default setting in blueprints
componentImages:
dashboard: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0-SNAPSHOT-latest
- holmes_rules: onap/holmes/rule-management:1.2.4-STAGING-latest
- holmes_engine: onap/holmes/engine-management:1.2.3-STAGING-latest
+ holmes_rules: onap/holmes/rule-management:1.2.6-STAGING-latest
+ holmes_engine: onap/holmes/engine-management:1.2.5-STAGING-latest
tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1
ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.4
snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
diff --git a/kubernetes/readiness/docker/init/Dockerfile b/kubernetes/readiness/docker/init/Dockerfile
index 7214e04174..b060915354 100644
--- a/kubernetes/readiness/docker/init/Dockerfile
+++ b/kubernetes/readiness/docker/init/Dockerfile
@@ -1,17 +1,12 @@
-from ubuntu:16.04
+FROM python:2-alpine
ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
# Setup Corporate proxy
ENV https_proxy ${HTTPS_PROXY}
ENV http_proxy ${HTTP_PROXY}
-# Additional packages
-RUN apt-get update
-RUN apt-get install -y apt-utils git wget curl dnsutils python python-pip jq net-tools coreutils vim
-
RUN pip install requests pyyaml kubernetes
-
ENV CERT="/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
ENV TOKEN="/var/run/secrets/kubernetes.io/serviceaccount/token"
@@ -21,4 +16,5 @@ RUN chmod a+x /root/ready.py
COPY job_complete.py /root/job_complete.py
RUN chmod a+x /root/job_complete.py
-ENTRYPOINT /root/ready.py
+ENTRYPOINT ["/root/ready.py"]
+CMD [""] \ No newline at end of file
diff --git a/kubernetes/readiness/docker/init/job_complete.py b/kubernetes/readiness/docker/init/job_complete.py
index 97d22da6c1..b20cb5adec 100644
--- a/kubernetes/readiness/docker/init/job_complete.py
+++ b/kubernetes/readiness/docker/init/job_complete.py
@@ -1,9 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import getopt
import logging
import os
import sys
import time
+import random
from kubernetes import client
@@ -91,7 +92,8 @@ def main(argv):
log.warning("timed out waiting for '" + job_name + "' to be completed")
exit(1)
else:
- time.sleep(5)
+ # spread in time potentially parallel execution in multiple containers
+ time.sleep(random.randint(5, 11))
if __name__ == "__main__":
main(sys.argv[1:]) \ No newline at end of file
diff --git a/kubernetes/readiness/docker/init/ready.py b/kubernetes/readiness/docker/init/ready.py
index 87c09a444c..0e133eab01 100644
--- a/kubernetes/readiness/docker/init/ready.py
+++ b/kubernetes/readiness/docker/init/ready.py
@@ -1,9 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import getopt
import logging
import os
import sys
import time
+import random
from kubernetes import client
@@ -154,7 +155,8 @@ def main(argv):
log.warning("timed out waiting for '" + container_name + "' to be ready")
exit(1)
else:
- time.sleep(5)
+ # spread in time potentially parallel execution in multiple containers
+ time.sleep(random.randint(5, 11))
if __name__ == "__main__":
main(sys.argv[1:])
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
index c1babf3063..0be06f3985 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
@@ -51,6 +51,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
+ - containerPort: {{ .Values.service.internalPort2 }}
{{ if .Values.liveness.enabled }}
livenessProbe:
tcpSocket:
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
index 47145fc9ec..2134309f46 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
@@ -29,7 +29,7 @@ global:
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/gvnfmdriver:1.3.0
+image: onap/vfc/gvnfmdriver:1.3.1
pullPolicy: Always
#Istio sidecar injection policy
@@ -87,4 +87,4 @@ resources:
requests:
cpu: 200m
memory: 500Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
index 8833a5a627..f68f0fc790 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
@@ -29,7 +29,7 @@ global:
flavor: small
repository: nexus3.onap.org:10001
-image: onap/vfc/jujudriver:1.3.0
+image: onap/vfc/jujudriver:1.3.1
pullPolicy: Always
#Istio sidecar injection policy
@@ -88,4 +88,4 @@ resources:
requests:
cpu: 200m
memory: 2000Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}