This is an automated email from the ASF dual-hosted git repository.
eamonford pushed a commit to branch helm-ingester
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/helm-ingester by this push:
new 8b44aba wip
8b44aba is described below
commit 8b44aba72a76027dc01072639de5a36d0bc27655
Author: Eamon Ford <[email protected]>
AuthorDate: Wed Jul 1 11:06:46 2020 -0500
wip
---
helm/crds/gitbasedconfig-crd.yml | 34 ++++++++++++++++++++++
...lection-manager.yaml => collection-manager.yml} | 0
helm/templates/collections-config-gitcfg.yml | 13 +++++++++
helm/templates/config-operator-rbac.yml | 19 ++++++++++++
helm/templates/config-operator.yml | 23 +++++++++++++++
helm/templates/{ingress.yaml => ingress.yml} | 0
.../{root-webpage.yaml => root-webpage.yml} | 0
helm/templates/{webapp.yaml => webapp.yml} | 0
helm/values.yaml | 6 ++++
9 files changed, 95 insertions(+)
diff --git a/helm/crds/gitbasedconfig-crd.yml b/helm/crds/gitbasedconfig-crd.yml
new file mode 100644
index 0000000..6143752
--- /dev/null
+++ b/helm/crds/gitbasedconfig-crd.yml
@@ -0,0 +1,34 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: gitbasedconfigs.sdap.apache.org
+spec:
+ group: sdap.apache.org
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ scope: Namespaced
+ names:
+ plural: gitbasedconfigs
+ singular: gitbasedconfig
+ kind: GitBasedConfig
+ shortNames:
+ - gitcfg
+ validation:
+ openAPIV3Schema:
+ type: object
+ properties:
+ git-url:
+ type: string
+ git-branch:
+ type: string
+ git-token:
+ type: string
+ update-every-seconds:
+ type: int
+ local-dir:
+ type: string
+ config-map:
+ type: string
+
diff --git a/helm/templates/collection-manager.yaml
b/helm/templates/collection-manager.yml
similarity index 100%
rename from helm/templates/collection-manager.yaml
rename to helm/templates/collection-manager.yml
diff --git a/helm/templates/collections-config-gitcfg.yml
b/helm/templates/collections-config-gitcfg.yml
new file mode 100644
index 0000000..4288ea0
--- /dev/null
+++ b/helm/templates/collections-config-gitcfg.yml
@@ -0,0 +1,13 @@
+apiVersion: sdap.apache.org/v1
+kind: GitBasedConfig
+metadata:
+ name: collections-config-gitcfg
+spec:
+ {{ if .Values.ingestion.collectionsConfig.git }}
+ git-url: {{ .Values.ingestion.collectionsConfig.git.url }}
+ git-branch: {{ .Values.ingestion.collectionsConfig.git.branch }}
+ git-token: {{ .Values.ingestion.collectionsConfig.token }}
+ {{ else }}
+ local-dir: {{ .Values.ingestion.collectionsConfig.localDir }}
+ {{ end }}
+ config-map: collections-config
diff --git a/helm/templates/config-operator-rbac.yml
b/helm/templates/config-operator-rbac.yml
new file mode 100644
index 0000000..54064d5
--- /dev/null
+++ b/helm/templates/config-operator-rbac.yml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: config-operator
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: config-operator-role-binding
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: cluster-admin
+subjects:
+ - kind: ServiceAccount
+ name: config-operator
+
diff --git a/helm/templates/config-operator.yml
b/helm/templates/config-operator.yml
new file mode 100644
index 0000000..7a3952b
--- /dev/null
+++ b/helm/templates/config-operator.yml
@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: config-operator
+ labels:
+ app: sdap-config-operator
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: sdap-config-operator
+ template:
+ metadata:
+ labels:
+ app: sdap-config-operator
+ spec:
+ serviceAccountName: config-operator
+ containers:
+ - name: sdap-config-operator
+ image: nexusjpl/config-operator:latest
+ imagePullPolicy: Always
+
+
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yml
similarity index 100%
rename from helm/templates/ingress.yaml
rename to helm/templates/ingress.yml
diff --git a/helm/templates/root-webpage.yaml b/helm/templates/root-webpage.yml
similarity index 100%
rename from helm/templates/root-webpage.yaml
rename to helm/templates/root-webpage.yml
diff --git a/helm/templates/webapp.yaml b/helm/templates/webapp.yml
similarity index 100%
rename from helm/templates/webapp.yaml
rename to helm/templates/webapp.yml
diff --git a/helm/values.yaml b/helm/values.yaml
index ff86d85..33a379b 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -22,6 +22,12 @@ webapp:
ingestion:
dataPath: /Users/edford/Desktop/ingestion_test/data
+ collectionsConfig:
+# localDir: /Users/edford/Desktop/collections.yml
+ git:
+ url: https://github.com/eamonford/sdap-ingestion-test.git
+ branch: master
+ token: test
collectionManager:
enabled: true
