helm charts merge conflicts fixed

deploy/helm/avro-schema-registry/releases/production.yaml

@@ -9,8 +9,8 @@ ingress:
   enabled: true
   classname: data-ingress
   hosts:
-    - avro-schema-registry-prd.shave.io
-    - avro-schema-registry-prd-read-only.shave.io
+    - avro-schema-registry-2-prd.shave.io
+    - avro-schema-registry-2-prd-read-only.shave.io
   labels:
     app.kubernetes.io/managed-by: "Helm"
   annotations:
@@ -22,7 +22,7 @@ ingress:
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/subnets: subnet-2d1a7645, subnet-d71970bf, subnet-f1197099
     alb.ingress.kubernetes.io/target-type: instance
-    external-dns.alpha.kubernetes.io/hostname: avro-schema-registry-prd.shave.io, avro-schema-registry-prd-read-only.shave.io
+    external-dns.alpha.kubernetes.io/hostname: avro-schema-registry-2-prd.shave.io, avro-schema-registry-prd-2-read-only.shave.io
 
 app:
   secretsEnv: production

deploy/helm/avro-schema-registry/templates/deployment.yaml

@@ -24,26 +24,15 @@ spec:
       dnsPolicy: {{ .Values.dnsPolicy }}
       dnsConfig:
 {{ toYaml .Values.dnsConfig | indent 8 }}
-<<<<<<< Updated upstream
-=======
-    {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml . | indent 8 }}
-    {{- end }}
->>>>>>> Stashed changes
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-<<<<<<< Updated upstream
-=======
           command: ["rails", "server", "-b", "0.0.0.0", "-p", "3000"]
->>>>>>> Stashed changes
           ports:
             - containerPort: {{ .Values.service.internalPort }}
               protocol: TCP
           env:
-<<<<<<< Updated upstream
             - name: RACK_ENV
               value: {{ .Values.app.railsEnv | quote }}
             - name: RAILS_ENV
@@ -85,29 +74,10 @@ spec:
                 secretKeyRef:
                   name: {{ printf "es.%s-aws-sm-ss" (include "fullname" .) }}
                   key: db_url
-=======
             - name: STATSD_HOST
               value: {{ .Values.app.statsdHost | quote }}
             - name: STATSD_PORT
               value: {{ .Values.app.statsdPort | quote }}
-            - name: RAILS_LOG_TO_STDOUT
-              value: {{ .Values.app.railsLogStdOut | quote }}
-            - name: RAILS_ENV
-              value: {{ .Values.app.env | quote }}
-            - name: VAULT_ROLE
-              value: {{ .Values.app.role | quote }}
-            - name: VAULT_ADDR
-              value: {{ .Values.app.vaultAddr | quote }}
-{{- if .Values.app.vaultToken }}
-            - name: VAULT_TOKEN
-              value: {{ .Values.app.vaultToken | quote }}
-{{- end }}
-            - name: VAULT_K8S_AUTH_URL_PREFIX
-              value: {{ .Values.app.vaultK8sAuthUrlPrefix | quote }}
-            - name: VAULT_SECRET_PREFIX
-              value: {{ .Values.app.vaultSecretPrefix | quote }}
-            - name: VAULT_TOKEN_PATH
-              value: {{ .Values.app.vaultTokenPath | quote }}
             - name: AVRO_SCHEMA_REGISTRY_URL
               value: {{ .Values.app.avroSchemaRegistryUrl | quote }}
             - name: CANONICAL_SHIPMENTS_TOPIC
@@ -126,8 +96,6 @@ spec:
               value: {{ .Values.app.databaseConcurrency | quote }}
             - name: TOOLBELT_PUBLIC_KEY_URI
               value: {{ .Values.app.toolbeltPublicKeyURI | quote }}
-            - name: SECRET_KEY_BASE
-              value: {{ .Values.app.secretKeyBase | quote }}
             - name: MYSQL_DB_NAME
               valueFrom:
                 secretKeyRef:
@@ -153,16 +121,12 @@ spec:
                 secretKeyRef:
                   name: {{ printf "es.%s-aws-sm-ss" (include "fullname" .) }}
                   key: db_username
->>>>>>> Stashed changes
             - name: SECRET_KEY_BASE
               valueFrom:
                 secretKeyRef:
                   name: {{ printf "es.%s-aws-sm-ss" (include "fullname" .) }}
                   key: secret_key_base
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
           livenessProbe:
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             timeoutSeconds: {{  .Values.livenessProbe.timeoutSeconds }}
@@ -183,7 +147,6 @@ spec:
               port: {{ .Values.service.internalPort }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-<<<<<<< Updated upstream
 {{- if .Values.volumes }}
       volumes:
 {{ toYaml .Values.volumes | indent 8 }}
@@ -200,13 +163,4 @@ spec:
       tolerations:
 {{- toYaml . | nindent 8 }}
 {{- end }}
-=======
-    {{- if .Values.volumes }}
-      volumes:
-{{ toYaml .Values.volumes | indent 8 }}
-    {{- end }}
-    {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-    {{- end }}
->>>>>>> Stashed changes
+

deploy/helm/avro-schema-registry/templates/external-secrets.yaml

@@ -38,16 +38,10 @@ spec:
   target:
     name: {{ printf "es.%s-aws-sm-ss" (include "fullname" .) }}
   data:
-<<<<<<< Updated upstream
     - secretKey: db_url
       remoteRef:
         key: avro-schema-registry/{{ .Values.app.secretsEnv }}
         property: /db/url
-    - secretKey: secret_key_base
-      remoteRef:
-        key: avro-schema-registry/{{ .Values.app.secretsEnv }}
-        property: /secretkeybase
-=======
     - secretKey: db_name
       remoteRef:
         key: arm-monolith/{{ .Values.app.secretsEnv }}
@@ -72,4 +66,3 @@ spec:
       remoteRef:
         key: arm-monolith/{{ .Values.app.secretsEnv }}
         property: /0/secret_key_base
->>>>>>> Stashed changes

deploy/helm/avro-schema-registry/templates/ingress.yaml

@@ -1,7 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $servicePort := .Values.service.externalPort -}}
 {{- $serviceName := .Values.service.name -}}
-<<<<<<< Updated upstream
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -11,20 +10,11 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-=======
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "fullname" . }}
-  labels:
-{{ include "labels" . | indent 4 }}
->>>>>>> Stashed changes
   annotations:
     {{- range $key, $value := .Values.ingress.annotations }}
       {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
-<<<<<<< Updated upstream
   ingressClassName: {{ .Values.ingress.class }}
   rules:
     {{- range $host := .Values.ingress.hosts }}
@@ -38,16 +28,6 @@ spec:
                 name: {{ $serviceName }}
                 port:
                   number: {{ $servicePort }}
-=======
-  ingressClassName: {{ .Values.ingress.classname }}
-  rules:
-    {{- range $host := .Values.ingress.hosts }}
-    - host: {{ $host }}
-      http:
-        paths:
-          - backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
->>>>>>> Stashed changes
     {{- end -}}
 {{- end -}}
+

deploy/helm/avro-schema-registry/templates/migrations-job.yaml

@@ -19,13 +19,10 @@ spec:
     spec:
       serviceAccountName: {{ .Values.app.vaultRole }}
       restartPolicy: {{ .Values.restartPolicy }}
-<<<<<<< Updated upstream
-=======
     {{- with .Values.image.pullSecrets }}
       imagePullSecrets:
 {{ toYaml . | indent 8 }}
     {{- end }}
->>>>>>> Stashed changes
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -46,23 +43,4 @@ spec:
               value: {{ .Values.app.secretKeyBase | quote }}
             - name: DISABLE_DATABASE_ENVIRONMENT_CHECK
               value: {{ .Values.app.dbDisableEnvCheck | quote }} # "1" necessary for upgrades with db:setup
-<<<<<<< Updated upstream
-=======
-            - name: VAULT_ADDR
-              value: {{ .Values.app.vaultAddr | quote }}
-            - name: VAULT_PATH_PREFIX
-              value: {{ .Values.app.vaultPathPrefix | quote }}
-{{- if .Values.app.vaultRole }}
-            - name: VAULT_ROLE
-              value: {{ .Values.app.vaultRole | quote }}
-{{- end }}
-{{- if .Values.app.vaultToken }}
-            - name: VAULT_TOKEN
-              value: {{ .Values.app.vaultToken | quote }}
-{{- end }}
-{{- if .Values.app.vaultK8sAuthUrlPrefix }}
-            - name: VAULT_K8S_AUTH_URL_PREFIX
-              value: {{ .Values.app.vaultK8sAuthUrlPrefix | quote }}
-{{- end }}
->>>>>>> Stashed changes
 {{- end }}

deploy/helm/avro-schema-registry/templates/service-account.yaml

@@ -1,12 +1,8 @@
-{{- if and (.Values.createServiceAccount) (.Values.app.vaultRole) }}
+{{- if(.Values.createServiceAccount)}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-<<<<<<< Updated upstream
-  name: {{ .Values.app.role }}
-=======
   name: {{ .Values.app.vaultRole }}
->>>>>>> Stashed changes
   labels:
 {{ include "labels" . | indent 4 }}
   annotations:

deploy/helm/avro-schema-registry/templates/service.yaml

@@ -3,37 +3,16 @@ kind: Service
 metadata:
   name: {{ .Values.service.name }}
   labels:
-<<<<<<< Updated upstream
     app: {{ template "fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-=======
-{{ include "labels" . | indent 4 }}
->>>>>>> Stashed changes
 spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.externalPort }}
-<<<<<<< Updated upstream
       targetPort: {{ .Values.service.internalPort }}
       protocol: TCP
       name: {{ .Values.service.name }}
   selector:
     app: {{ template "fullname" . }}
-=======
-{{- if  .Values.envoy.enabled }}
-      name: {{ .Values.envoy.name }}
-      targetPort: {{ .Values.envoy.internalProxyPort }}
-      protocol: TCP
-{{- else }}
-      name: {{ .Chart.Name }}
-      targetPort: {{ .Values.service.internalPort }}
-      protocol: TCP
-{{- end }}
-{{- if eq .Values.service.type "NodePort" }}
-      nodePort: {{ .Values.service.nodePort }}
-{{- end }}
-  selector:
-    app: {{ template "name" . }}
->>>>>>> Stashed changes

deploy/helm/avro-schema-registry/values.yaml

@@ -8,14 +8,6 @@ image:
   repository: 932427637498.dkr.ecr.us-west-2.amazonaws.com/avro-schema-registry
   tag: master
   pullPolicy: Always
-<<<<<<< Updated upstream
-=======
-  pullSecrets:
-   - name: dollarshaveclub-kubernetes-pull-secret
->>>>>>> Stashed changes
-
-nameOverride: ""
-fullnameOverride: ""
 
 service:
   name: avro-schema-registry
@@ -29,26 +21,11 @@ createSecret: false
 
 ingress:
   enabled: false
-<<<<<<< Updated upstream
   class: alb
-  hosts:
-    - host: schemaregistry.example.local
-      paths: [ ]
-  annotations:
-    ingress.kubernetes.io/force-ssl-redirect: "true"
-=======
-  classname: nginx
-  hosts:
-  annotations:
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
   hosts:
     - host: schemaregistry.example.local
       paths: []
 
-dqaIngress:
-  enabled: false
->>>>>>> Stashed changes
-
 dnsPolicy: ClusterFirst
 dnsConfig: {}
 #  options:
@@ -61,10 +38,7 @@ dnsConfig: {}
 
 app:
   env: development
-<<<<<<< Updated upstream
-  secretsEnv: development
-=======
->>>>>>> Stashed changes
+  secretsEnv:
   secretName: ''
   railsEnv: production # use production for all environments
   railsLogToStdOut: true
@@ -80,41 +54,15 @@ app:
   defaultCompatibility: BACKWARD
   webWorkerProcesses: 4
   maxWebThreads: 25
-<<<<<<< Updated upstream
   rollbarAccessToken: ''
   ddAPMServiceName: avro-schema-registry
   ddTraceAnalyticsEnabled: false
-  ddTraceEnabled: false
   ddTracerHostname: datadog-agent.default.svc.cluster.local
-=======
-  vaultAddr: http://vault:8200
-  vaultRole: ''
-  vaultK8sAuthUrlPrefix: kubernetes
-  vaultTokenPath: /var/run/secrets/kubernetes.io/serviceaccount/token
-  vaultPathPrefix: secret/services/avro-schema-registry/
-  rollbarAccessToken: ''
-  ddAPMServiceName: avro-schema-registry
-  ddTraceAnalyticsEnabled: false
-  ddTracerHostname: datadog.tools.svc.cluster.local
->>>>>>> Stashed changes
   ddTracerPort: 8126
 
 job:
   activeDeadlineSeconds: 600
 
-<<<<<<< Updated upstream
-=======
-envoy:
-  name: envoy-sidecar
-  defaultHostHTTP10: avro-schema-registry
-  enabled: false
-  image:
-    repo: envoyproxy/envoy
-    tag: v1.12.3
-  internalAdminPort: 9091
-  internalProxyPort: 10000
-
->>>>>>> Stashed changes
 livenessProbe:
   initialDelaySeconds: 300
   timeoutSeconds: 5
@@ -139,10 +87,10 @@ resources: {} # remove and uncomment limits, updating with desired settings
   #   memory: 128Mi
   # requests:
   #   cpu: 100m
-  #   memory: 128Mi
+#   memory: 128Mi
 
 nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}