From 0c8dbdb94f8498505233f6336ac45b93005c3878 Mon Sep 17 00:00:00 2001 From: vrvarma Date: Thu, 2 Apr 2020 13:10:05 -0400 Subject: [PATCH] Add optf-cmso oom helm charts Making the charts consistent based on comments Fixing oom gating issue related to busyBoxImage value not found Moving and fixing cmso certs to this checkin Adding oof-cmso to the hardcoded certificates list Change-Id: Id48903ef7c38d69fcd8da5e067c2031359c94b56 Signed-off-by: vrvarma Issue-ID: OPTFRA-720 --- docs/oom_hardcoded_certificates.rst | 6 +++ .../oof-cmso-optimizer/templates/deployment.yaml | 7 +++ .../oof-cmso/charts/oof-cmso-optimizer/values.yaml | 4 +- .../oof-cmso-service/templates/deployment.yaml | 7 +++ .../oof-cmso/charts/oof-cmso-service/values.yaml | 6 +-- .../oof-cmso-ticketmgt/templates/deployment.yaml | 8 +++ .../oof-cmso/charts/oof-cmso-ticketmgt/values.yaml | 3 +- .../oof-cmso-topology/templates/deployment.yaml | 8 +++ .../oof-cmso/charts/oof-cmso-topology/values.yaml | 2 +- .../oof-cmso/resources/certs/org.onap.oof.jks | Bin 3711 -> 3817 bytes .../oof-cmso/resources/certs/org.onap.oof.keyfile | 54 ++++++++++----------- kubernetes/oof/charts/oof-cmso/values.yaml | 4 +- 12 files changed, 73 insertions(+), 36 deletions(-) diff --git a/docs/oom_hardcoded_certificates.rst b/docs/oom_hardcoded_certificates.rst index 0745ec0df4..d5f8672dc3 100644 --- a/docs/oom_hardcoded_certificates.rst +++ b/docs/oom_hardcoded_certificates.rst @@ -50,3 +50,9 @@ Here's the list of these certificates: +------------------+------------------+------------------+--------------------------------------------------------------------------------------------+ | VID | No | Yes | No | kubernetes/vid/resources/cert | +------------------+------------------+------------------+--------------------------------------------------------------------------------------------+ + | OOF/OOF-CMSO | Yes | No | No | kubernetes/oof/charts/oof-cmso/resources/certs | + +------------------+------------------+------------------+--------------------------------------------------------------------------------------------+ + | OOF/OOF-HAS | Yes | No | No | kubernetes/oof/charts/oof-has/resources/config | + +------------------+------------------+------------------+--------------------------------------------------------------------------------------------+ + | OOF/OOF-OSDF | Yes | No | No | kubernetes/oof/resources/config | + +------------------+------------------+------------------+--------------------------------------------------------------------------------------------+ diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml index c2d6f8c7ef..67808472b6 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/templates/deployment.yaml @@ -45,6 +45,13 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness + - name: {{ include "common.name" . }}-chown + command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /share/"] + image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - name: {{ include "common.fullname" . }}-logs + mountPath: /share/logs - name: db-init image: "{{ include "common.repository" . }}/{{ .Values.dbinit.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml index a9a89ddd72..f3f176fded 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml @@ -25,12 +25,12 @@ subChartsOnly: # application image repository: nexus3.onap.org:10001 -image: onap/optf-cmso-optimizer:2.1.1 +image: onap/optf-cmso-optimizer:2.2.0 pullPolicy: Always #init container image dbinit: - image: onap/optf-cmso-dbinit:2.1.1 + image: onap/optf-cmso-dbinit:2.2.0 # flag to enable debugging - application support required debugEnabled: false diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml index b41b840fde..ca45d7ee12 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml @@ -45,6 +45,13 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness + - name: {{ include "common.name" . }}-chown + command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /share/"] + image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - name: {{ include "common.fullname" . }}-logs + mountPath: /share/logs - name: db-init image: "{{ include "common.repository" . }}/{{ .Values.dbinit.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml index 345f03d4d3..90a74bd3ed 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml @@ -25,13 +25,13 @@ subChartsOnly: # application image repository: nexus3.onap.org:10001 -image: onap/optf-cmso-service:2.1.1 -robotimage: onap/optf-cmso-robot:2.1.1 +image: onap/optf-cmso-service:2.2.0 +robotimage: onap/optf-cmso-robot:2.2.0 pullPolicy: Always #init container image dbinit: - image: onap/optf-cmso-dbinit:2.1.1 + image: onap/optf-cmso-dbinit:2.2.0 # flag to enable debugging - application support required debugEnabled: false diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/templates/deployment.yaml index 53d1b26755..0b0b7e0890 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/templates/deployment.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/templates/deployment.yaml @@ -30,6 +30,14 @@ spec: app: {{ include "common.name" . }} release: {{ include "common.release" . }} spec: + initContainers: + - name: {{ include "common.name" . }}-chown + command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /share/"] + image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - name: {{ include "common.fullname" . }}-logs + mountPath: /share/logs containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml index 300a72cbae..846245a42c 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml @@ -20,13 +20,12 @@ global: # global defaults readinessRepository: oomk8s readinessImage: readiness-check:2.0.0 authentication: proprietary-auth - subChartsOnly: enabled: true # application image repository: nexus3.onap.org:10001 -image: onap/optf-cmso-ticketmgt:2.1.1 +image: onap/optf-cmso-ticketmgt:2.2.0 pullPolicy: Always diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/templates/deployment.yaml index 8cc4a986c5..a23ac430c9 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/templates/deployment.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/templates/deployment.yaml @@ -30,6 +30,14 @@ spec: app: {{ include "common.name" . }} release: {{ include "common.release" . }} spec: + initContainers: + - name: {{ include "common.name" . }}-chown + command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /share/"] + image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - name: {{ include "common.fullname" . }}-logs + mountPath: /share/logs containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml index c8ac5d7880..775da43928 100644 --- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml +++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml @@ -25,7 +25,7 @@ subChartsOnly: # application image repository: nexus3.onap.org:10001 -image: onap/optf-cmso-topology:2.1.1 +image: onap/optf-cmso-topology:2.2.0 pullPolicy: Always diff --git a/kubernetes/oof/charts/oof-cmso/resources/certs/org.onap.oof.jks b/kubernetes/oof/charts/oof-cmso/resources/certs/org.onap.oof.jks index 535abaa92b979f493aa76498c81989611c24bb49..f1e01085f95d059a4b271d91b3dc9ad3547b04bf 100644 GIT binary patch delta 2149 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 Yd-8xxoUcO4d57c=g3kBI9rhRg1(F`?yZ`_I delta 2057 zcmV+k2=@2s9seAVC4XverXY&|00jatf&~6B4h9M<1_1;CDgqG!0R;dAf&}V}V8Z>0 zv8jt9=g4OFc{jNra@yb|u!}+8lXu>I+y9@a)jb26$wK#Fd>hB9Q(!N*d?=|klmu=z z3np23Ih)H?HhFpd5w&xxk69L>c#$m+r0fT{bc-Y^Vkv;~g@0ci@A&1YtP03VSA->9 zrlpS(n2%V8duen?`q%`rPDSwYzo%25&a3r4HuN7t`Vm9d%p8c018p7hXX1fgU&XZs z;RKsXrXs)V>8W<(R7P+60@Y_8;c7+2U&<`?K;`p;=T3&=Up>CZq`mp_AMhG1OOf`p`G4d)pr>mN&!JRrp9@LKk)&xH z_2v&A-?No*QVH+ZjHX9jBhkdH@a3EPwR9idV-TDidqj#5AKe)Gr7?nINDq zS=5m_4}Uepo6K`uIz%-N$JrkUw8?$z?RB`u?L=jlCD(7@>B>tha7|EgVC$7jEP`5f z&xpzy|8mEf5I63=(7E-TR9zTptN!h)Uu(C&6EQLIG#bOfxKIZ?v>F@`m>9v6FOYM{ zesSje(oiLxjhR9tnGdY#UfKSvNyuf$Us7^J9D$TzDLbNxhdwB}kEw~GO&!nA}LO*qu_9tsH3%`8=Fy8QmNjpn9FD@EQ} zsOekOnN@rc_vnnwtjAD(Li>OzS^WPE;D3I)rB^Nkj;v3|xkkl1?9;OY2IdMPjOZHsJpRy^z&s|!YpWpOJ{#Ic7W!CR zI@0Dro>B7u%@k=C8mB3#!D?0je&0avQTJu@t$=}FUF8}{wm8=a>OatNBgE7oRDTsF z7#z6@ZG*UJH_clEHiz&FuD7pY$M3<_Xkz4U-c_oOEqAd(NV*2&{A`;{KWzcjjEc6& zlE6?q=f^ZL+l$6^xaajLfP-m2`@XCHeEd-rNL;g=jyaMv2u z4ZZ_8TyYG6IIEt1oWj4mflEF&Eq{x6V&+}fXg-NSH$C+jZ8{+%Zu`ug$ObW7 zFwtK7$~jBHWLh8DNebz;H%c}*Z;|u+`Z*gKbf6}FJ+z|+a5|= zxS+?x64;&TJhQu;CV9mhdqgRHe4I5r@pDmsqoUz;@y&9?2p0s#U72z)dJB~B`c zRg+W&TwO6aFf=nTF*GtcFfm#e4Kgq=G&3+UG%`6bF})WF&Quy1_Mb0Et-_h;YV~{n0$RNq4#j2@*Hxc63q9Z zWyZ?A%>YaL^yttS{|F!^pt1Q7J~32fP20L?uDY$nglI-u+(*otFKRdc5`tR*jaypT zktULCfH@>oz+_=H0YI;-?>J&|B@6$vmm^%sRHu|IH|C-W?+`BbgOHUGE-??n8v+9X z00EK z1yEJ<$^_SW-}rJ_a1D9UmWAhYEZ~$n;v0+cJo26%l{;LKV?cwY9&?!&JHz?NpUbGL zSSf%s&O|OmGEtzGvdQ>Z%yE_tbbjrOjHbM7JYH>H?d{HgBY4x1gq#qN1-XoE>aO>~ z>jQN$i%J=8HE-tJRM9?OZEpr9L6oa)!)@UY2~tpm$Lx9Z>LF{v;~5bPDo;zd@f{ts zE}8~J6gF)9FoeIb&p)Lt3WNj{iamM7o`m80{tz