@newskit-render/core 4.0.2-alpha.0 → 4.1.0-alpha.1

package/infrastructure/.circleci/config.yml

@@ -22,7 +22,7 @@ orbs:
 executors:
   helm:
     docker:
-      - image: nukengprodservice/helm:0.1.102
+      - image: nukengprodservice/helm:0.1.181
         auth:
           username: ${DOCKER_USERNAME}
           password: ${DOCKER_PASSWORD}

package/infrastructure/helm/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.0
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.0.1
+appVersion: 0.0.2

package/infrastructure/helm/templates/_helpers.tpl

@@ -45,6 +45,8 @@ news.co.uk/service-name: {{ .Values.tags.serviceName }}
 news.co.uk/environment: {{ .Values.environment }}
 {{- end -}}
 
+
+
 {{/*
 Selector labels
 */}}
@@ -53,6 +55,12 @@ app.kubernetes.io/name: {{ include "core.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
+{{- define "core.annotations" -}}
+meta.helm.sh/release-name: {{ .Chart.Name | quote }}
+meta.helm.sh/release-namespace: {{ .Values.namespace | quote }}
+app.kubernetes.io/managed-by: "Helm"  
+{{- end }}
+
 {{/*
 Annotations for ALB
 */}}

package/infrastructure/helm/templates/deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "core.fullname" . }}
   namespace: {{ .Values.namespace }}
   labels: {{ include "core.labels" . | nindent 4 }}
+  annotations: {{ include "core.annotations" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}

package/infrastructure/helm/templates/horizontalpodautoscaler.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "core.fullname" . }}-hpa
   namespace: {{ .Values.namespace }}
   labels: {{ include "core.labels" . | nindent 4 }}
+  annotations: {{ include "core.annotations" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

package/infrastructure/helm/templates/ingress.yaml

@@ -14,18 +14,18 @@ spec:
     {{- else }}
     - http:
     {{- end }}
-         paths:
+        paths:
          - pathType: Prefix
            path: /
-           backend:
+           backend: 
              service:
-               name: ssl-redirect
-               port: 
-                 name: use-annotation
+              name: ssl-redirect
+              port:
+                name: use-annotation 
          - pathType: Prefix
            path: /
            backend:
               service:
                 name: {{ include "core.fullname" . }}
                 port: 
-                  number: {{ .Values.service.port }}
+                  number: {{ .Values.service.port }}

package/infrastructure/helm/templates/networkpolicy.yaml

@@ -5,7 +5,8 @@ kind: NetworkPolicy
 metadata:
   name: {{ $fullName }}-allowed-traffic
   namespace: {{ .Values.namespace }}
-  annotations: {{ include "core.labels" . | nindent 4 }}
+  labels: {{ include "core.labels" . | nindent 4 }}
+  annotations: {{ include "core.annotations" . | nindent 4 }}
 spec:
   podSelector:
     matchExpressions :

package/infrastructure/helm/templates/secret.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "core.fullname" . }}
   namespace: {{ .Values.namespace }}
   labels: {{ include "core.labels" . | nindent 4 }}
+  annotations: {{ include "core.annotations" . | nindent 4 }}
 type: Opaque
 data:
   {{- range $key, $value := .Values.secret.items }}

package/infrastructure/helm/templates/service.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "core.fullname" . }}
   namespace: {{ .Values.namespace }}
   labels: {{ include "core.labels" . | nindent 4 }}
+  annotations: {{ include "core.annotations" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "4.0.2-alpha.0",
+  "version": "4.1.0-alpha.1",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -41,12 +41,12 @@
     "@emotion/styled": "11.9.3",
     "@newskit-render/api": "^1.6.8",
     "@newskit-render/auth": "^1.3.11",
-    "@newskit-render/checkout": "^3.0.2-alpha.0",
+    "@newskit-render/checkout": "^3.0.2-alpha.1",
     "@newskit-render/feature-flags": "^1.4.11",
     "@newskit-render/feed": "^1.4.18",
     "@newskit-render/my-account": "^6.0.1",
     "@newskit-render/shared-components": "^3.1.0",
-    "@newskit-render/standalone-components": "^3.2.0-alpha.0",
+    "@newskit-render/standalone-components": "^3.2.0-alpha.1",
     "@newskit-render/validation": "^1.6.0",
     "@next/font": "13.1.6",
     "cross-fetch": "3.1.5",

package/pages/help-hub/error.tsx

@@ -14,7 +14,7 @@ const ErrorPageHelpHub: React.FC<{
 }
 
 export const getServerSideProps = async (context) => {
-  newrelic.setTransactionName('HelpHubArticlePage')
+  newrelic.setTransactionName('HelpHubErrorPage')
   console.warn('context:')
   console.warn(context.req && context.req.headers)