This is an automated email from the ASF dual-hosted git repository. tloubrieu pushed a commit to branch moc_deployment in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 7026407cb3dfc966f9f5f901df6c03295857a511 Author: thomas loubrieu <[email protected]> AuthorDate: Wed Jun 9 10:40:31 2021 -0700 updates for MOC deployment --- helm/templates/config-operator-rbac.yml | 24 ---------------------- helm/templates/config-operator.yml | 25 ----------------------- helm/templates/gitbasedconfig-crd.yml | 35 --------------------------------- helm/templates/role.yaml | 21 ++++++++++++++++++++ helm/templates/rolebinding.yaml | 17 ++++++++++++++++ helm/templates/spark-sa.yaml | 8 ++++++++ helm/templates/spark-serviceaccount.yml | 17 ---------------- helm/templates/webapp.yml | 4 ++-- 8 files changed, 48 insertions(+), 103 deletions(-) diff --git a/helm/templates/config-operator-rbac.yml b/helm/templates/config-operator-rbac.yml deleted file mode 100644 index b295430..0000000 --- a/helm/templates/config-operator-rbac.yml +++ /dev/null @@ -1,24 +0,0 @@ -{{ if .Values.ingestion.enabled }} -{{ if not .Values.ingestion.collections.configMap }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: config-operator - ---- - -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: config-operator-role-binding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: - - kind: ServiceAccount - name: config-operator - namespace: {{ .Release.Namespace }} -{{ end }} -{{ end }} - diff --git a/helm/templates/config-operator.yml b/helm/templates/config-operator.yml deleted file mode 100644 index 298095e..0000000 --- a/helm/templates/config-operator.yml +++ /dev/null @@ -1,25 +0,0 @@ -{{ if .Values.ingestion.enabled }} -{{ if not .Values.ingestion.collections.configMap }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: config-operator - labels: - app: config-operator -spec: - replicas: 1 - selector: - matchLabels: - app: config-operator - template: - metadata: - labels: - app: config-operator - spec: - serviceAccountName: config-operator - containers: - - name: config-operator - image: {{ .Values.ingestion.configOperator.image }} - imagePullPolicy: Always -{{ end }} -{{ end }} diff --git a/helm/templates/gitbasedconfig-crd.yml b/helm/templates/gitbasedconfig-crd.yml deleted file mode 100644 index 8c1dd4c..0000000 --- a/helm/templates/gitbasedconfig-crd.yml +++ /dev/null @@ -1,35 +0,0 @@ -{{ if .Values.ingestion.collections.createCrd }} -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 -{{ end }} diff --git a/helm/templates/role.yaml b/helm/templates/role.yaml new file mode 100644 index 0000000..152bb23 --- /dev/null +++ b/helm/templates/role.yaml @@ -0,0 +1,21 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + labels: + app.kubernetes.io/instance: spark-operator + app.kubernetes.io/name: spark-operator + app.kubernetes.io/version: v1beta2-1.2.3-3.1.1 + name: sdap-spark-role +rules: + - verbs: + - '*' + apiGroups: + - '' + resources: + - pods + - verbs: + - '*' + apiGroups: + - '' + resources: + - services diff --git a/helm/templates/rolebinding.yaml b/helm/templates/rolebinding.yaml new file mode 100644 index 0000000..34ee010 --- /dev/null +++ b/helm/templates/rolebinding.yaml @@ -0,0 +1,17 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + labels: + app.kubernetes.io/instance: spark-operator + app.kubernetes.io/name: spark-operator + app.kubernetes.io/version: v1beta2-1.2.3-3.1.1 + name: spark +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: sdap-spark-role +subjects: +- kind: ServiceAccount + name: sdap-spark + namespace: $(namespace) + diff --git a/helm/templates/spark-sa.yaml b/helm/templates/spark-sa.yaml new file mode 100644 index 0000000..a977729 --- /dev/null +++ b/helm/templates/spark-sa.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: sdap-spark + labels: + app.kubernetes.io/instance: spark-operator + app.kubernetes.io/name: spark-operator + app.kubernetes.io/version: v1beta2-1.2.3-3.1.1 diff --git a/helm/templates/spark-serviceaccount.yml b/helm/templates/spark-serviceaccount.yml deleted file mode 100644 index 76a47c7..0000000 --- a/helm/templates/spark-serviceaccount.yml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: spark-serviceaccount -automountServiceAccountToken: true ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: spark-serviceaccount-role-binding -subjects: -- kind: ServiceAccount - name: spark-serviceaccount -roleRef: - kind: ClusterRole - name: admin - apiGroup: rbac.authorization.k8s.io \ No newline at end of file diff --git a/helm/templates/webapp.yml b/helm/templates/webapp.yml index d14f877..319a66a 100644 --- a/helm/templates/webapp.yml +++ b/helm/templates/webapp.yml @@ -27,7 +27,7 @@ spec: {{ .Values.webapp.distributed.driver | toYaml | indent 4 }} labels: version: 2.4.4 - serviceAccount: spark-serviceaccount + serviceAccount: sdap-spark executor: {{ .Values.webapp.distributed.executor| toYaml | indent 4 }} labels: @@ -50,4 +50,4 @@ spec: port: 8083 targetPort: 8083 -{{ end }} \ No newline at end of file +{{ end }}
