Commit 15a07083 authored by George Papathanail's avatar George Papathanail
Browse files

chore(srm): remove artefact-manager 

SRM 2.0 and FM 2.0 no longer call it.
parent fb168c4d

environments/kind/values.yaml

+0 −6
Changes for environments/kind/values.yaml: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ srm: 
      networkAdapterBaseUrl: ""

      scsAsId: ""

      natsUrl: "nats://oop-nats:4222"

  artifactManager:

    service:

      type: NodePort

      nodePort: 30080

    image:

      pullPolicy: IfNotPresent



oeg:

  oegcontroller:

oop-platform-chart/charts/srm/templates/_helpers.tpl

+0 −17
Changes for oop-platform-chart/charts/srm/templates/_helpers.tpl: 0 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -69,23 +69,6 @@ app.kubernetes.io/instance: {{ .Release.Name }} 
io.kompose.service: {{ .Values.srmcontroller.name }}

{{- end }}



{{/*

Artifact Manager labels

*/}}

{{- define "srm.artifactmanager.labels" -}}

helm.sh/chart: {{ include "srm.chart" . }}

{{ include "srm.artifactmanager.selectorLabels" . }}

app.kubernetes.io/managed-by: {{ .Release.Service }}

{{- end }}



{{/*

Artifact Manager selector labels

*/}}

{{- define "srm.artifactmanager.selectorLabels" -}}

app: {{ .Values.artifactManager.name }}

app.kubernetes.io/instance: {{ .Release.Name }}

{{- end }}



{{/*

Return the proper namespace

*/}}

oop-platform-chart/charts/srm/templates/artifactmanager-deployment.yaml

deleted100644 → 0
+0 −34
Changes for oop-platform-chart/charts/srm/templates/artifactmanager-deployment.yaml: 0 added lines, 34 removed lines.
Original line number Diff line number Diff line 
{{- if .Values.artifactManager.enabled }}

apiVersion: apps/v1

kind: Deployment

metadata:

  name: {{ .Values.artifactManager.name }}

  namespace: {{ include "srm.namespace" . }}

  labels:

    {{- include "srm.artifactmanager.labels" . | nindent 4 }}

spec:

  replicas: {{ .Values.artifactManager.replicaCount }}

  selector:

    matchLabels:

      {{- include "srm.artifactmanager.selectorLabels" . | nindent 6 }}

  template:

    metadata:

      labels:

        {{- include "srm.artifactmanager.selectorLabels" . | nindent 8 }}

    spec:

      containers:

        - name: {{ .Values.artifactManager.name }}

          image: "{{ .Values.artifactManager.image.repository }}:{{ .Values.artifactManager.image.tag }}"

          imagePullPolicy: {{ .Values.artifactManager.image.pullPolicy }}

          ports:

            - name: http

              containerPort: {{ .Values.artifactManager.service.targetPort }}

              protocol: TCP

          env:

            - name: PYTHONPATH

              value: {{ .Values.artifactManager.env.pythonPath | quote }}

          {{- with .Values.artifactManager.resources }}

          resources:

            {{- toYaml . | nindent 12 }}

          {{- end }}

{{- end }}

oop-platform-chart/charts/srm/templates/artifactmanager-service.yaml

deleted100644 → 0
+0 −21
Changes for oop-platform-chart/charts/srm/templates/artifactmanager-service.yaml: 0 added lines, 21 removed lines.
Original line number Diff line number Diff line 
{{- if .Values.artifactManager.enabled }}

apiVersion: v1

kind: Service

metadata:

  name: {{ .Values.artifactManager.service.name }}

  namespace: {{ include "srm.namespace" . }}

  labels:

    {{- include "srm.artifactmanager.labels" . | nindent 4 }}

spec:

  type: {{ .Values.artifactManager.service.type }}

  ports:

    - name: http

      protocol: TCP

      port: {{ .Values.artifactManager.service.port }}

      targetPort: {{ .Values.artifactManager.service.targetPort }}

      {{- if and (eq .Values.artifactManager.service.type "NodePort") .Values.artifactManager.service.nodePort }}

      nodePort: {{ .Values.artifactManager.service.nodePort }}

      {{- end }}

  selector:

    {{- include "srm.artifactmanager.selectorLabels" . | nindent 4 }}

{{- end }}

oop-platform-chart/charts/srm/templates/srmcontroller-deployment.yaml

+0 −2
Changes for oop-platform-chart/charts/srm/templates/srmcontroller-deployment.yaml: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ spec: 
              value: {{ .Values.srmcontroller.env.k8sNamespace | quote }}

            - name: KUBERNETES_MASTER_TOKEN

              value: {{ .Values.srmcontroller.env.kubernetesMasterToken | quote }}

            - name: ARTIFACT_MANAGER_ADDRESS

              value: {{ .Values.srmcontroller.env.artifactManagerAddress | quote }}

            - name: EDGE_CLOUD_ADAPTER_NAME

              value: {{ .Values.srmcontroller.env.edgeCloudAdapterName | quote }}

            - name: ADAPTER_BASE_URL