Commit c71cb45d authored by George Papathanail's avatar George Papathanail
Browse files

chore(helm): remove 1.x-only env vars, kompose annotations and the duckdns ingress 

Drops the hard-coded Kubernetes service-account token from charts/srm/values.yaml, the SRM/OEG 1.x env vars, the unused SRM ingress block, the kompose annotations and io.kompose.service label, and the commented-out probes. OEG ingress is now disabled by default with no class or host.
parent 7b56ea0c

environments/kind/values.yaml

+0 −3
Changes for environments/kind/values.yaml: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ srm: 
      tag: "1.1"

      pullPolicy: IfNotPresent

    env:

      networkAdapterName: "oai"

      networkAdapterBaseUrl: ""

      scsAsId: ""

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



oeg:

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

+0 −1
Changes for oop-platform-chart/charts/oeg/templates/_helpers.tpl: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ OEG Controller selector labels 
{{- define "oeg.controller.selectorLabels" -}}

app.kubernetes.io/name: {{ .Values.oegcontroller.name }}

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

io.kompose.service: {{ .Values.oegcontroller.name }}

{{- end }}



{{/*

oop-platform-chart/charts/oeg/templates/ingress.yaml

+3 −1
Changes for oop-platform-chart/charts/oeg/templates/ingress.yaml: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ metadata: 
    {{- toYaml . | nindent 4 }}

    {{- end }}

spec:

  ingressClassName: {{ .Values.ingress.className }}

  {{- with .Values.ingress.className }}

  ingressClassName: {{ . }}

  {{- end }}

  {{- if .Values.ingress.tls.enabled }}

  tls:

    - hosts:

oop-platform-chart/charts/oeg/templates/oegcontroller-deployment.yaml

+0 −26
Changes for oop-platform-chart/charts/oeg/templates/oegcontroller-deployment.yaml: 0 added lines, 26 removed lines.
Original line number Diff line number Diff line
@@ -38,37 +38,11 @@ spec: 
              containerPort: {{ .Values.oegcontroller.service.targetPort }}

              protocol: TCP

          env:

            - name: SRM_HOST

              value: {{ .Values.oegcontroller.env.srmHost | quote }}

            - name: FEDERATION_MANAGER_HOST

              value: {{ .Values.oegcontroller.env.federationManagerHost | quote }}

            - name: PARTNER_API_ROOT

              value: {{ .Values.oegcontroller.env.partnerApiRoot | quote }}

            - name: TOKEN_ENDPOINT

              value: {{ .Values.oegcontroller.env.tokenEndpoint | quote }}

            - name: AVAIL_ZONE_NOTIF_LINK

              value: {{ .Values.oegcontroller.env.availZoneNotifLink | quote }}

            - name: NATS_URL

              value: {{ .Values.oegcontroller.env.natsUrl | quote }}

          {{- with .Values.oegcontroller.resources }}

          resources:

            {{- toYaml . | nindent 12 }}

          {{- end }}

        #  livenessProbe:

         #   httpGet:

          #    path: /

          #    port: http

          #  initialDelaySeconds: 30

          #  periodSeconds: 10

          #  timeoutSeconds: 5

          #  failureThreshold: 3

         # readinessProbe:

         #   httpGet:

         #     path: /

         #     port: http

         #   initialDelaySeconds: 10

         #   periodSeconds: 5

         #   timeoutSeconds: 3

         #   failureThreshold: 3

      restartPolicy: Always

{{- end }}

oop-platform-chart/charts/oeg/values.yaml

+6 −14
Changes for oop-platform-chart/charts/oeg/values.yaml: 6 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -23,21 +23,15 @@ oegcontroller: 


  # Environment variables

  env:

    srmHost: "http://srm:8080/srm/1.0.0"

    federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1"

    partnerApiRoot: "http://10.8.0.1:31002"

    tokenEndpoint: "http://keycloak.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"

    availZoneNotifLink: ""

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



# Ingress configuration

ingress:

  enabled: true

  className: traefik

  annotations:

    traefik.ingress.kubernetes.io/router.entrypoints: web

  host: isiath.duckdns.org

  path: /oeg

  enabled: false

  className: ""

  annotations: {}

  host: ""

  path: /

  pathType: Prefix

  # TLS configuration (optional)

  tls:
@@ -48,6 +42,4 @@ ingress: 
commonLabels: {}



# Annotations to apply to all resources

commonAnnotations:

  kompose.cmd: kompose convert

  kompose.version: 1.26.0 (40646f47)
 
commonAnnotations: {}