Updating portal/gateway component versions to 5.4.2.x, switch example ingress to Contour

example/Makefile

@@ -62,7 +62,7 @@ portal-example: redis
 	./portal-integration/create-tenant.sh -d ./portal-integration/enroll-payload.json -n ${NAMESPACE}
 
 g2c-agent:
-#sed -e 's/ip:.*/ip: "$(shell kubectl get svc ingress-nginx-controller -n ingress-nginx -ojsonpath="{.spec.clusterIP}")"/g' ./portal-integration/g2c-agent/deployment-template.yaml > ./portal-integration/g2c-agent/deployment.yaml
+	sed -e 's/ip:.*/ip: "$(shell kubectl get svc contour-envoy -n projectcontour -ojsonpath="{.spec.clusterIP}")"/g' ./portal-integration/g2c-agent/deployment-template.yaml > ./portal-integration/g2c-agent/deployment.yaml
 	kubectl apply -k ./portal-integration/g2c-agent
 	echo "deploy g2cagent"
 
@@ -78,7 +78,7 @@ default-redis:
 	kubectl wait --for=condition=ready --timeout=600s pod -l app.kubernetes.io/name=redis
 
 grafana-stack:
-	helm repo add grafana https://grafana.github.io/helm-charts
+	helm repo add grafana https://grafana-community.github.io/helm-charts
 	helm upgrade --install --values ./otel-lgtm/grafana-stack/loki-overrides.yaml loki grafana/loki -n grafana-loki --create-namespace
 	helm upgrade --install --values ./otel-lgtm/grafana-stack/promtail-overrides.yaml promtail grafana/promtail -n grafana-loki
 	helm upgrade --install --values ./otel-lgtm/grafana-stack/tempo-overrides.yaml tempo grafana/tempo -n grafana-loki

example/gateway/portal-gateway.yaml

@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: portal-ssg
 spec:
-  version: "11.1.2"
+  version: "11.2.1"
   license:
     accept: false
     secretName: gateway-license
@@ -13,7 +13,7 @@ spec:
       minAvailable: 2
     replicas: 1
     restartOnConfigChange: true
-    image: caapim/gateway:11.1.2
+    image: caapim/gateway:11.2.1
     imagePullPolicy: IfNotPresent
     updateStrategy:
       type: rollingUpdate
@@ -72,14 +72,14 @@ spec:
     portalReference:
       enabled: true
       portalName: example-k8
-      initContainerImage:  caapim/portal-bulk-sync:5.3.3
+      initContainerImage:  caapim/portal-bulk-sync:5.4.2
       initContainerImagePullPolicy: Always
     bootstrap:
       script:
         enabled: true
     initContainers:
     - name: gateway-init
-      image: caapim/gateway-init-portal:5.3.3
+      image: caapim/gateway-init-portal:5.4.2.3
       imagePullPolicy: Always
       volumeMounts:
       - name: config-directory

example/portal-integration/g2c-agent/deployment-template.yaml

@@ -23,7 +23,7 @@ spec:
         - "dev-portal-ssg.brcmlabs.com"
       containers:
       - name: portal-g2c-agent
-        image: caapim/portal-g2c-agent:5.3.3
+        image: caapim/portal-g2c-agent:5.4.2
         imagePullPolicy: Always
         resources:
           requests:

example/portal-integration/portal-values.yaml

@@ -10,6 +10,8 @@ portal:
   domain: brcmlabs.com
   analytics:
     enabled: false
+  seaweedFs:
+    enabled: false
   internalSSG:
     secretName: ssg-secret
   papi:
@@ -30,17 +32,17 @@ ingress:
     - portal
 
 image:
-  dispatcher: dispatcher:5.3.3
-  apim: ingress:5.3.3
-  enterprise: portal-enterprise:5.3.3
-  data: portal-data:5.3.3
-  tps: tenant-provisioning-service:5.3.3
-  analytics: analytics-server:5.3.3
-  authenticator: authenticator:5.3.3
-  dbUpgrade: db-upgrade-portal:5.3.3
-  rbacUpgrade: db-upgrade-rbac:5.3.3
-  upgradeVerify: upgrade-verify:5.3.3
-  tlsManager: tls-automator:5.3.3
+  dispatcher: dispatcher:5.4.2.3
+  apim: ingress:5.4.2.3
+  enterprise: portal-enterprise:5.4.2.3
+  data: portal-data:5.4.2.3
+  tps: tenant-provisioning-service:5.4.2.3
+  analytics: analytics-server:5.4.2.3
+  authenticator: authenticator:5.4.2.3
+  dbUpgrade: db-upgrade-portal:5.4.2.3
+  rbacUpgrade: db-upgrade-rbac:5.4.2.3
+  upgradeVerify: upgrade-verify:5.4.2.3
+  tlsManager: tls-automator:5.4.2.3
 
 rabbitmq:
   enabled: true
@@ -49,7 +51,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.3.3"
+    tag: "5.4.2"
     pullSecrets:
       - broadcom-apim
   pdb:

example/portal-integration/readme.md

@@ -166,7 +166,7 @@ kubectl get pods
 ```
 
 ### Deploy the Developer Portal
-The Portal deployed is version 5.3.3 which supports layer7-operator gateways enroled with the portal as a proxy. 
+The Portal deployed is version 5.4.2.3 which supports layer7-operator gateways enroled with the portal as a proxy. 
 The Portal is deployed to the default namespace and uses the following [portal-values.yaml](../portal-integration/portal-values.yaml)
 
 You can deploy the portal using the following commands