76 files changed, 366 insertions, 2 deletions

diff --git a/kubernetes/contrib/Makefile b/kubernetes/contrib/Makefile
new file mode 100644
index 0000000000..eb9f025fc8
--- /dev/null
+++ b/kubernetes/contrib/Makefile
@@ -0,0 +1,31 @@
+# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+make-contrib: make-contrib-awx make-contrib-netbox make-contrib-ejbca make-contrib-core
+
+make-contrib-awx:
+	cd components && helm dep up awx && helm lint awx
+
+make-contrib-ejbca:
+	cd components && helm dep up ejbca && helm lint ejbca
+
+make-contrib-netbox:
+	cd components && helm dep up netbox && helm lint netbox
+
+make-contrib-core:
+	helm dep up . && helm lint .
+
+clean:
+	@find . -type f -name '*.tgz' -delete
+	@find . -type f -name '*.lock' -delete
diff --git a/kubernetes/contrib/charts/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index 6cd16b4783..6cd16b4783 100755
--- a/kubernetes/contrib/charts/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
diff --git a/kubernetes/contrib/charts/awx/Makefile b/kubernetes/contrib/components/awx/Makefile
index d8a50339d6..d8a50339d6 100644
--- a/kubernetes/contrib/charts/awx/Makefile
+++ b/kubernetes/contrib/components/awx/Makefile
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml
index e30faf275e..e30faf275e 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/NOTES.txt b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt
index 3ab092e848..3ab092e848 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/NOTES.txt
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml
index 67d13cf477..67d13cf477 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml
index bfe63abafe..bfe63abafe 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml
index e12dabf175..e12dabf175 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml
index f560417425..f560417425 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml
index 09012ead47..09012ead47 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/values.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/Chart.yaml b/kubernetes/contrib/components/awx/charts/awx/Chart.yaml
index 00dca3f62c..00dca3f62c 100755
--- a/kubernetes/contrib/charts/awx/charts/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/Chart.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/resources/config/credentials.py b/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py
index 39350e05d0..39350e05d0 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/resources/config/credentials.py
+++ b/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py
diff --git a/kubernetes/contrib/charts/awx/charts/awx/resources/config/environment.sh b/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh
index 7c58c6bb48..7c58c6bb48 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/resources/config/environment.sh
+++ b/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/configmap.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml
index 9bc62b0856..9bc62b0856 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/configmap.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml
index 4be13fbf88..4be13fbf88 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml
index 642f779214..642f779214 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/service.yaml
index 10f031da82..10f031da82 100755
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/service.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/serviceaccout.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml
index 0f52ce800a..0f52ce800a 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/serviceaccout.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml
index 988ac174ae..988ac174ae 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml
diff --git a/kubernetes/contrib/charts/awx/charts/awx/values.yaml b/kubernetes/contrib/components/awx/charts/awx/values.yaml
index fd77a12c0b..fd77a12c0b 100755
--- a/kubernetes/contrib/charts/awx/charts/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/values.yaml
diff --git a/kubernetes/contrib/charts/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
index a748affaac..a748affaac 100755
--- a/kubernetes/contrib/charts/awx/requirements.yaml
+++ b/kubernetes/contrib/components/awx/requirements.yaml
diff --git a/kubernetes/contrib/charts/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index 6c6a90e0de..6c6a90e0de 100755
--- a/kubernetes/contrib/charts/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
new file mode 100644
index 0000000000..4de6930f0c
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -0,0 +1,18 @@
+# Copyright © 2020 Nokia
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+description: ONAP EJBCA test server
+name: ejbca
+version: 6.0.0
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
new file mode 100644
index 0000000000..e87bc08da3
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/requirements.yaml
@@ -0,0 +1,25 @@
+# Copyright © 2020 Orange, Ericsson
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: mariadb-galera
+    version: ~6.x-0
+    repository: '@local'
+    condition: global.mariadbGalera.localCluster
+  - name: mariadb-init
+    version: ~6.x-0
+    repository: '@local'
+    condition: not global.mariadbGalera.localCluster
diff --git a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
new file mode 100755
index 0000000000..f1bd07e158
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+waitForEjbcaToStart() {
+    until $(curl -kI https://localhost:8443/ejbca/publicweb/healthcheck/ejbcahealth --output /dev/null --silent --head --fail)
+    do
+        sleep 5
+    done
+}
+
+configureEjbca() {
+    ejbca.sh config cmp addalias --alias cmpRA
+    ejbca.sh config cmp updatealias --alias cmpRA --key operationmode --value ra
+    ejbca.sh ca editca --caname ManagementCA --field cmpRaAuthSecret --value ${RA_IAK}
+    ejbca.sh config cmp updatealias --alias cmpRA --key responseprotection --value pbe
+    ejbca.sh config cmp dumpalias --alias cmpRA
+    ejbca.sh config cmp addalias --alias cmp
+    ejbca.sh config cmp updatealias --alias cmp --key allowautomatickeyupdate --value true
+    ejbca.sh config cmp updatealias --alias cmp --key responseprotection --value pbe
+    ejbca.sh ra addendentity --username Node123 --dn "CN=Node123" --caname ManagementCA --password ${CLIENT_IAK} --type 1 --token USERGENERATED
+    ejbca.sh ra setclearpwd --username Node123 --password ${CLIENT_IAK}
+    ejbca.sh config cmp updatealias --alias cmp --key extractusernamecomponent --value CN
+    ejbca.sh config cmp dumpalias --alias cmp
+    ejbca.sh ca getcacert --caname ManagementCA -f /dev/stdout > cacert.pem
+}
+
+
+waitForEjbcaToStart
+configureEjbca
diff --git a/kubernetes/contrib/components/ejbca/templates/configmap.yaml b/kubernetes/contrib/components/ejbca/templates/configmap.yaml
new file mode 100644
index 0000000000..d336bc9a94
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/templates/configmap.yaml
@@ -0,0 +1,20 @@
+# Copyright © 2020, Nordix Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "common.fullname" . }}-config-script"
+data:
+{{ tpl (.Files.Glob "resources/ejbca-config.sh").AsConfig . | indent 2 }}
diff --git a/kubernetes/contrib/components/ejbca/templates/deployment.yaml b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
new file mode 100644
index 0000000000..c6981e5fc4
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
@@ -0,0 +1,92 @@
+# Copyright © 2020, Nordix Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector: {{- include "common.selectors" . | nindent 4 }}
+  template:
+    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+    spec:
+      initContainers:
+      - name: {{ include "common.name" . }}-db-readiness
+        command:
+        - /root/ready.py
+        args:
+        - --container-name
+        {{- if .Values.global.mariadbGalera.localCluster }}
+        - ejbca-galera
+        {{- else }}
+        - ejbca-config
+        {{- end }}
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+      containers:
+      - name: {{ include "common.name" . }}-ejbca
+        image: {{ .Values.ejbca.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "/opt/primekey/scripts/ejbca-config.sh"]
+        volumeMounts:
+          - name: "{{ include "common.fullname" . }}-volume"
+            mountPath: /opt/primekey/scripts/
+        ports: {{ include "common.containerPorts" . | nindent 10 }}
+        env:
+        - name: INITIAL_ADMIN
+          value: ";PublicAccessAuthenticationToken:TRANSPORT_ANY;"
+        - name: DATABASE_JDBC_URL
+          value: jdbc:mariadb://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ .Values.mysqlDatabase }}
+        - name: DATABASE_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ejbca-db-secret" "key" "login") | indent 10 }}
+        - name: DATABASE_PASSWORD
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ejbca-db-secret" "key" "password") | indent 10 }}
+        - name: RA_IAK
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ejbca-server-ra-iak" "key" "password") | indent 10 }}
+        - name: CLIENT_IAK
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ejbca-server-client-iak" "key" "password") | indent 10 }}
+        livenessProbe:
+          httpGet:
+            port: {{ .Values.liveness.port }}
+            path: {{ .Values.liveness.path }}
+            scheme: HTTPS
+          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.liveness.periodSeconds }}
+        readinessProbe:
+          httpGet:
+            port: {{ .Values.readiness.port }}
+            path: {{ .Values.readiness.path }}
+            scheme: HTTPS
+          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readiness.periodSeconds }}
+          {{- if .Values.nodeSelector }}
+        nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
+        {{- end -}}
+        {{- if .Values.affinity }}
+        affinity: {{ toYaml .Values.affinity | nindent 10 }}
+        {{- end }}
+      volumes:
+      - configMap:
+          name: "{{ include "common.fullname" . }}-config-script"
+          defaultMode: 0755
+        name: "{{ include "common.fullname" . }}-volume"
diff --git a/kubernetes/contrib/components/ejbca/templates/secret.yaml b/kubernetes/contrib/components/ejbca/templates/secret.yaml
new file mode 100644
index 0000000000..ecb51ae4d3
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/templates/secret.yaml
@@ -0,0 +1,15 @@
+# Copyright © 2020, Nordix Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/contrib/components/ejbca/templates/service.yaml b/kubernetes/contrib/components/ejbca/templates/service.yaml
new file mode 100644
index 0000000000..01680ee78e
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/templates/service.yaml
@@ -0,0 +1,15 @@
+# Copyright © 2020, Nordix Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ include "common.service" . }}
diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml
new file mode 100644
index 0000000000..0db7ca14be
--- /dev/null
+++ b/kubernetes/contrib/components/ejbca/values.yaml
@@ -0,0 +1,105 @@
+# Copyright © 2020, Nordix Foundation, Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+global:
+  readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.1
+  mariadbGalera: &mariadbGalera
+    #This flag allows EJBCA to instantiate its own mariadb-galera cluster
+    localCluster: false
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
+
+secrets:
+  - uid: ejbca-db-secret
+    name: &ejbca-db-secret '{{ include "common.release" . }}-ejbca-db-secret'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
+    login: '{{ .Values.config.db.userName }}'
+    password: '{{ .Values.config.db.userPassword }}'
+  - uid: ejbca-server-ra-iak
+    name: '{{ include "common.release" . }}-ejbca-ra-iak'
+    type: password
+    password: '{{ .Values.config.ejbca.raIak }}'
+  - uid: ejbca-server-client-iak
+    name: '{{ include "common.release" . }}-ejbca-client-iak'
+    type: password
+    password: '{{ .Values.config.ejbca.clientIak }}'
+
+# application configuration
+config:
+  db:
+    userName: ejbca
+    # userPassword: password
+    # userCredentialsExternalSecret: some-secret
+  ejbca: {}
+    # raIak: mypassword
+    # clientIak: mypassword
+
+mysqlDatabase: &dbName ejbca
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application configuration
+replicaCount: 1
+
+ejbca:
+  image: primekey/ejbca-ce:6.15.2.5
+pullPolicy: Always
+
+mariadb-galera:
+  # '&mariadbConfig' means we "store" the values for  later use in the file
+  # with '*mariadbConfig' pointer.
+  config: &mariadbConfig
+    userCredentialsExternalSecret: *ejbca-db-secret
+    mysqlDatabase: *dbName
+  nameOverride: ejbca-galera
+  service:
+    name: ejbca-galera
+    portName: ejbca-galera
+    internalPort: 3306
+  replicaCount: 1
+  persistence:
+    enabled: true
+    mountSubPath: ejbca/maria/data
+
+mariadb-init:
+  config: *mariadbConfig
+  nameOverride: ejbca-config
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+  path: /ejbca/publicweb/healthcheck/ejbcahealth
+  port: api
+  initialDelaySeconds: 30
+  periodSeconds: 30
+
+readiness:
+  path: /ejbca/publicweb/healthcheck/ejbcahealth
+  port: api
+  initialDelaySeconds: 30
+  periodSeconds: 30
+
+service:
+  type: ClusterIP
+  ports:
+    - name: api
+      port: 8443
+      plain_port: 8080
+      port_protocol: http
diff --git a/kubernetes/contrib/charts/netbox/.helmignore b/kubernetes/contrib/components/netbox/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/charts/netbox/.helmignore
+++ b/kubernetes/contrib/components/netbox/.helmignore
diff --git a/kubernetes/contrib/charts/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index 04f3144336..04f3144336 100755
--- a/kubernetes/contrib/charts/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
diff --git a/kubernetes/contrib/charts/netbox/Makefile b/kubernetes/contrib/components/netbox/Makefile
index 3194d40020..3194d40020 100644
--- a/kubernetes/contrib/charts/netbox/Makefile
+++ b/kubernetes/contrib/components/netbox/Makefile
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/.helmignore b/kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/.helmignore
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml
index 787bc4a971..787bc4a971 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/configuration.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py
index 7d704ae762..7d704ae762 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/configuration.py
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py
index c7d9f7b725..c7d9f7b725 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py
index c7e0d3bee9..c7e0d3bee9 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml
index c23e29a11d..c23e29a11d 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/groups.yml b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml
index 1f4a5a7a6e..1f4a5a7a6e 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/groups.yml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml
index 77d330beac..77d330beac 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
index 5db036f708..5db036f708 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py
index 7626058357..7626058357 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py
index 7932874704..7932874704 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py
index 5c40e37bf2..5c40e37bf2 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/NOTES.txt b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt
index e70c418864..e70c418864 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/NOTES.txt
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/configmap.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml
index f785478e1b..f785478e1b 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/configmap.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml
index 16c592f48a..16c592f48a 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/job.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml
index f4002773fd..f4002773fd 100644
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/job.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml
index a61217fb94..a61217fb94 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml
index 7e25a0f1ef..7e25a0f1ef 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/secrets.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml
index c06bc5a333..c06bc5a333 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/secrets.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/service.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml
index 74d1116f50..74d1116f50 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/service.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml
index ddfdc4b976..ddfdc4b976 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/.helmignore b/kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/.helmignore
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml
index 4abaa27365..4abaa27365 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/resources/config/nginx.conf b/kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf
index 2ef2aca3a1..2ef2aca3a1 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/resources/config/nginx.conf
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/NOTES.txt b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt
index bd74a42cd5..bd74a42cd5 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/NOTES.txt
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/configmap.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml
index 26242be8e2..26242be8e2 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/configmap.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml
index d79309dfa9..d79309dfa9 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml
index ed761374fa..ed761374fa 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml
index f67ff06410..f67ff06410 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/.helmignore b/kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/.helmignore
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml
index c439e1d580..c439e1d580 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/NOTES.txt b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt
index bd74a42cd5..bd74a42cd5 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/NOTES.txt
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/configmap.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml
index 9bc530577a..9bc530577a 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/configmap.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml
index 45468e4969..45468e4969 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml
index 37d07f05a1..37d07f05a1 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml
index 30da3add0d..30da3add0d 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/service.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml
index 75335884df..75335884df 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/service.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml
index 1db2457171..1db2457171 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml
diff --git a/kubernetes/contrib/charts/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
index 6e0025e41c..6e0025e41c 100755
--- a/kubernetes/contrib/charts/netbox/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/requirements.yaml
diff --git a/kubernetes/contrib/charts/netbox/templates/ingress.yaml b/kubernetes/contrib/components/netbox/templates/ingress.yaml
index 701d4c8063..701d4c8063 100755
--- a/kubernetes/contrib/charts/netbox/templates/ingress.yaml
+++ b/kubernetes/contrib/components/netbox/templates/ingress.yaml
diff --git a/kubernetes/contrib/charts/netbox/values.yaml b/kubernetes/contrib/components/netbox/values.yaml
index 2dfb36b1e5..2dfb36b1e5 100755
--- a/kubernetes/contrib/charts/netbox/values.yaml
+++ b/kubernetes/contrib/components/netbox/values.yaml
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 6e0025e41c..b1739312a7 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -15,4 +15,16 @@
 dependencies:
   - name: common
     version: ~6.x-0
-    repository: '@local'
\ No newline at end of file
+    repository: '@local'
+  - name: awx
+    version: ~6.x-0
+    repository: 'file://components/awx'
+    condition: awx.enabled
+  - name: ejbca
+    version: ~6.x-0
+    repository: 'file://components/ejbca'
+    condition: global.cmpv2Enabled
+  - name: netbox
+    version: ~6.x-0
+    repository: 'file://components/netbox'
+    condition: netbox.enabled
diff --git a/kubernetes/contrib/values.yaml b/kubernetes/contrib/values.yaml
index e15806ff1c..8a44934d8f 100644
--- a/kubernetes/contrib/values.yaml
+++ b/kubernetes/contrib/values.yaml
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  cmpv2Enabled: true
+
 awx:
   enabled: true
 netbox:
-  enabled: true
\ No newline at end of file
+  enabled: true