Merge pull request #683 from lamw/issue-509

Update Knative Serving/Eventing stack to v1.1.0
vmware-samples · Jan 24, 2022 · 350b000 · 350b000
2 parents 7b83d50 + a5f5c2b
commit 350b000
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 69 deletions.
diff --git a/files/configs/event-router/vmware-event-router-clusterrole.yaml b/files/configs/event-router/vmware-event-router-clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: addressable-resolver
+  name: knative-serving-aggregated-addressable-resolver
 subjects:
 - kind: ServiceAccount
   name: vmware-event-router

diff --git a/files/configs/knative/rabbit.yaml b/files/configs/knative/rabbit.yaml
@@ -3,6 +3,8 @@ kind: RabbitmqCluster
 metadata:
   name: veba-rabbit
   namespace: vmware-system
+  annotations:
+    rabbitmq.com/topology-allowed-namespaces: "vmware-functions"
 spec:
   resources:
     requests:

diff --git a/files/downloads/cert-manager/overlay.yaml b/files/downloads/cert-manager/overlay.yaml
@@ -0,0 +1,31 @@
+#@ load("@ytt:overlay", "overlay")
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "cert-manager-cainjector"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "cert-manager"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "cert-manager-webhook"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
diff --git a/files/downloads/rabbitmq-messaging-operator/overlay.yaml b/files/downloads/rabbitmq-messaging-operator/overlay.yaml
@@ -0,0 +1,11 @@
+#@ load("@ytt:overlay", "overlay")
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "messaging-topology-operator"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
diff --git a/files/setup-05-knative.sh b/files/setup-05-knative.sh
@@ -24,6 +24,14 @@ kubectl wait pod --timeout=3m --for=condition=Ready -l '!job-name' -n knative-ev
 echo -e "\e[92mDeploying RabbitMQ Cluster Operator ..." > /dev/console
 kubectl apply -f /root/download/cluster-operator.yml
 
+echo -e "\e[92mDeploying Cert-Manager ..." > /dev/console
+kubectl apply -f /root/download/cert-manager.yaml
+kubectl wait deployment --all --timeout=3m --for=condition=Available -n cert-manager
+
+echo -e "\e[92mDeploying RabbitMQ Messaging Operator ..." > /dev/console
+kubectl apply -f /root/download/messaging-topology-operator-with-certmanager.yaml
+kubectl wait deployment --all --timeout=3m --for=condition=Available -n rabbitmq-system
+
 echo -e "\e[92mDeploying RabbitMQ Broker ..." > /dev/console
 kubectl apply -f /root/download/rabbitmq-broker.yaml
 kubectl apply -f /root/config/knative/rabbit.yaml

diff --git a/scripts/photon-containers.sh b/scripts/photon-containers.sh
@@ -21,19 +21,6 @@ done
 
 cd /root/download
 
-echo '> Downloading Contour...'
-CONTOUR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["contour"].gitRepoTag')
-git clone https://github.com/projectcontour/contour.git
-cd contour
-git checkout ${CONTOUR_VERSION}
-sed -i "s/latest/${CONTOUR_VERSION}/g" examples/contour/02-job-certgen.yaml
-cat >> examples/contour/03-envoy.yaml << EOF
-      dnsPolicy: ClusterFirstWithHostNet
-      hostNetwork: true
-EOF
-sed -i 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' examples/contour/*.yaml
-cd ..
-
 echo '> Downloading Antrea...'
 mkdir -p /root/download/antrea/templates
 ANTREA_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["antrea"].gitRepoTag')
@@ -44,14 +31,15 @@ curl -L https://github.com/vmware-tanzu/antrea/releases/download/${ANTREA_VERSIO
 ytt -f ${ANTREA_OVERLAY} -f ${ANTREA_TEMPLATE} > ${ANTREA_CONFIG}
 
 echo '> Downloading Knative...'
-KNATIVE_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative"].gitRepoTag')
-curl -L https://github.com/knative/serving/releases/download/${KNATIVE_VERSION}/serving-crds.yaml -o /root/download/serving-crds.yaml
-curl -L https://github.com/knative/serving/releases/download/${KNATIVE_VERSION}/serving-core.yaml -o /root/download/serving-core.yaml
+KNATIVE_SERVING_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-serving"].gitRepoTag')
+curl -L https://github.com/knative/serving/releases/download/knative-${KNATIVE_SERVING_VERSION}/serving-crds.yaml -o /root/download/serving-crds.yaml
+curl -L https://github.com/knative/serving/releases/download/knative-${KNATIVE_SERVING_VERSION}/serving-core.yaml -o /root/download/serving-core.yaml
 
-curl -L https://github.com/knative/eventing/releases/download/${KNATIVE_VERSION}/eventing-crds.yaml -o /root/download/eventing-crds.yaml
-curl -L https://github.com/knative/eventing/releases/download/${KNATIVE_VERSION}/eventing-core.yaml -o /root/download/eventing-core.yaml
+KNATIVE_EVENTING_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-eventing"].gitRepoTag')
+curl -L https://github.com/knative/eventing/releases/download/knative-${KNATIVE_EVENTING_VERSION}/eventing-crds.yaml -o /root/download/eventing-crds.yaml
+curl -L https://github.com/knative/eventing/releases/download/knative-${KNATIVE_EVENTING_VERSION}/eventing-core.yaml -o /root/download/eventing-core.yaml
 
-echo '> Downloading RabbitMQ...'
+echo '> Downloading RabbitMQ Broker/Operator...'
 mkdir -p /root/download/rabbitmq-operator/templates
 RABBITMQ_OPERATOR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["rabbitmq-operator"].gitRepoTag')
 RABBITMQ_OPERATOR_TEMPLATE=/root/download/rabbitmq-operator/templates/cluster-operator-template.yml
@@ -61,17 +49,36 @@ curl -L https://github.com/rabbitmq/cluster-operator/releases/download/${RABBITM
 ytt -f ${RABBITMQ_OPERATOR_OVERLAY} -f ${RABBITMQ_OPERATOR_TEMPLATE} > ${RABBITMQ_OPERATOR_CONFIG}
 
 RABBITMQ_BROKER_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["rabbitmq-broker"].gitRepoTag')
-curl -L https://github.com/knative-sandbox/eventing-rabbitmq/releases/download/${RABBITMQ_BROKER_VERSION}/rabbitmq-broker.yaml -o /root/download/rabbitmq-broker.yaml
+curl -L https://github.com/knative-sandbox/eventing-rabbitmq/releases/download/knative-${RABBITMQ_BROKER_VERSION}/rabbitmq-broker.yaml -o /root/download/rabbitmq-broker.yaml
+
+echo '> Downloading RabbitMQ Messaging Operator...'
+mkdir -p /root/download/rabbitmq-messaging-operator/templates
+RABBITMQ_MESSAGING_OPERATOR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["rabbitmq-messaging-topology-operator"].gitRepoTag')
+RABBITMQ_MESSAGING_OPERATOR_TEMPLATE=/root/download/rabbitmq-messaging-operator/templates/messaging-topology-operator-with-certmanager-template.yaml
+curl -L https://github.com/rabbitmq/messaging-topology-operator/releases/download/${RABBITMQ_MESSAGING_OPERATOR_VERSION}/messaging-topology-operator-with-certmanager.yaml -o ${RABBITMQ_MESSAGING_OPERATOR_TEMPLATE}
+RABBITMQ_MESSAGING_OPERATOR_OVERLAY=/root/download/rabbitmq-messaging-operator/overlay.yaml
+RABBITMQ_MESSAGING_OPERATOR_CONFIG=/root/download/messaging-topology-operator-with-certmanager.yaml
+ytt -f ${RABBITMQ_MESSAGING_OPERATOR_OVERLAY} -f ${RABBITMQ_MESSAGING_OPERATOR_TEMPLATE} > ${RABBITMQ_MESSAGING_OPERATOR_CONFIG}
+
+echo '> Downloading Cert-Manager...'
+mkdir -p /root/download/cert-manager/templates
+CERT_MANAGER_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["cert-manager"].gitRepoTag')
+CERT_MANAGER_TEMPLATE=/root/download/cert-manager/templates/cert-manager-template.yaml
+curl -L https://github.com/jetstack/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml -o ${CERT_MANAGER_TEMPLATE}
+CERT_MANAGER_OVERLAY=/root/download/cert-manager/overlay.yaml
+CERT_MANAGER_CONFIG=/root/download/cert-manager.yaml
+ytt -f ${CERT_MANAGER_OVERLAY} -f ${CERT_MANAGER_TEMPLATE} > ${CERT_MANAGER_CONFIG}
 
 echo '> Downloading Knative Contour...'
+KNATIVE_CONTOUR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-contour"].gitRepoTag')
 mkdir -p /root/download/knative-contour/templates
 KNATIVE_CONTOUR_TEMPLATE=/root/download/knative-contour/templates/knative-contour.yaml
 KNATIVE_CONTOUR_OVERLAY=/root/download/knative-contour/overlay.yaml
 KNATIVE_CONTOUR_CONFIG=/root/download/knative-contour.yaml
-curl -L https://github.com/knative/net-contour/releases/download/${KNATIVE_VERSION}/contour.yaml -o ${KNATIVE_CONTOUR_TEMPLATE}
+curl -L https://github.com/knative/net-contour/releases/download/knative-${KNATIVE_CONTOUR_VERSION}/contour.yaml -o ${KNATIVE_CONTOUR_TEMPLATE}
 ytt -f ${KNATIVE_CONTOUR_OVERLAY} -f ${KNATIVE_CONTOUR_TEMPLATE} > ${KNATIVE_CONTOUR_CONFIG}
 
-curl -L https://github.com/knative/net-contour/releases/download/${KNATIVE_VERSION}/net-contour.yaml -o /root/download/net-contour.yaml
+curl -L https://github.com/knative/net-contour/releases/download/knative-${KNATIVE_CONTOUR_VERSION}/net-contour.yaml -o /root/download/net-contour.yaml
 
 echo '> Downloading Local Path Provisioner...'
 mkdir -p /root/download/local-provisioner/templates

diff --git a/scripts/photon-settings.sh b/scripts/photon-settings.sh
@@ -53,8 +53,8 @@ K8S_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["kubernetes"].gitRepoTag' | sed 's/v//
 tdnf install -y kubelet-${K8S_VERSION} kubectl-${K8S_VERSION} kubeadm-${K8S_VERSION}
 
 echo '> Downloading Kn CLI'
-KNATIVE_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative"].gitRepoTag')
-wget https://github.com/knative/client/releases/download/${KNATIVE_VERSION}/kn-linux-amd64
+KNATIVE_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-cli"].version')
+wget https://github.com/knative/client/releases/download/knative-${KNATIVE_VERSION}/kn-linux-amd64
 chmod +x kn-linux-amd64
 mv kn-linux-amd64 /usr/local/bin/kn
 

diff --git a/veba-bom.json b/veba-bom.json
@@ -1,6 +1,6 @@
 {
     "veba": {
-        "version": "v0.7.1"
+        "version": "development"
     },
     "vmware-event-router": {
         "gitRepoTag": "development",
@@ -23,17 +23,6 @@
             "version": "v1.2.0"
         }]
     },
-    "contour": {
-        "gitRepoTag": "v1.9.0",
-        "containers": [{
-                "name": "projectcontour/contour",
-                "version": "v1.9.0"
-            },
-            {
-                "name": "envoyproxy/envoy",
-                "version": "v1.15.1"
-            }]
-    },
     "fluentbit": {
         "gitRepoTag": "v1.7.9",
         "containers": [{
@@ -87,47 +76,74 @@
             }
         ]
     },
-    "knative": {
-        "gitRepoTag": "v0.20.0",
-        "containers": [{
-                "name": "gcr.io/knative-releases/github.com/projectcontour/contour/cmd/contour@sha256",
-                "version": "3e88236949d49b0933318ef077741e9bf6f40ae84e8b79d7c229e1aaff53220f"
+    "knative-cli": {
+        "version": "v1.1.0"
+    },
+    "knative-serving": {
+        "gitRepoTag": "v1.1.0",
+            "containers": [{
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/queue@sha256",
+                "version": "48a1753de35ecbe060611aea9e95751e3e4851183c4373e65aa1b9410ea6e263"
             },
             {
-                "name": "envoyproxy/envoy",
-                "version": "v1.16.0"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/activator@sha256",
+                "version": "ba1485ded12049525afb9856c2fa10d613dbc2b2da90556116bf257f2128eaae"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/net-contour/cmd/controller@sha256",
-                "version": "5654ef5be4f506909bba6cbb59e7049d6c4bfc866066f2546bcabd2ff547307f"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/autoscaler@sha256",
+                "version": "dca8258a46dd225b8a72dfe63e8971b23876458f6f64b4ad82792c4d6e470bdc"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/activator@sha256",
-                "version": "cbeb1cdcdde8b3b44bc5eb1c5a07512a36f4bd7fbee5e9677e8789ee2459b6ed"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/controller@sha256",
+                "version": "2765feeaa3958827388e6f5119010ee08c0eec9ad7518bb38ac4b9a4355d87fb"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/autoscaler@sha256",
-                "version": "73d4d0503544ea930caa4fba07b701147339131de31a6aae8c52d6bb568f3c81"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/domain-mapping@sha256",
+                "version": "25df5b854d28dac69c6293db4db50d8fa819c96ad2f2a30bdde6aad467de1b17"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/controller@sha256",
-                "version": "3054c326df9de07a2a1ce34a2515339201706995a16f8efc8228295a6b94fbdd"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/domain-mapping-webhook@sha256",
+                "version": "6ccc1f6ac07d27e97d96c502b4c6e928d5fb3abd165ae7670e94a57788416c75"
             },
             {
                 "name": "gcr.io/knative-releases/knative.dev/serving/cmd/webhook@sha256",
-                "version": "07894526a4b49c61c5333e4f48190e830ce5124f0c18e1042cc15fcb594bfc37"
+                "version": "9f3c83def9d0d5de0e8e1d1f4c10f262e283fe12d21dcbb91de06b65d3bd08ad"
+            }
+        ]
+    },
+    "knative-eventing": {
+        "gitRepoTag": "v1.1.0",
+            "containers": [{
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/controller@sha256",
+                "version": "14e565af0a741a0e34b139d9661555189972af8d53e837305f711a3f9025e188"
+            },
+            {
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256",
+                "version": "afb65789e9c92414ef8885bb71ec1afd7dffe1730729a45fbf918356bd6ed7a1"
+            },
+            {
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/mtping@sha256",
+                "version": "6a78d2df8eec44bb983ae39952097670fad0556afc6d069fc88fd8347a014698"
             },
             {
-                "name": "gcr.io/knative-releases/controller-17550e04ebf9af897aa4b799ad074e13@sha256",
-                "version": "641c03911641bc86fc1b70db14e55caaa6a42c83fcc4f7cc9da50622afd6566e"
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/webhook@sha256",
+                "version": "9ca667c4d9c9c02b1549aee6d3fc13f40e8e54322260525665b029983c373ece"
+            }
+        ]
+    },
+    "knative-contour": {
+        "gitRepoTag": "v1.1.0",
+            "containers": [{
+                "name": "gcr.io/knative-releases/github.com/projectcontour/contour/cmd/contour@sha256",
+                "version": "5f726d901a2852197447b5d0ca43d7d0b3bb0756290fbd7984371ab5a49db853"
             },
             {
-                "name": "gcr.io/knative-releases/mtping-26ac4e6a49a610ffaac30cc0a8ab693a@sha256",
-                "version": "14c4da0990f2d6a27d62fe5c1d336d2663b034fa98835c672126afd719a1b03c"
+                "name": "docker.io/envoyproxy/envoy",
+                "version": "v1.19.1"
             },
             {
-                "name": "gcr.io/knative-releases/webhook-f31b5fdf3b3cdeb5a25aa0a5d79e4348@sha256",
-                "version": "eb480afef446b9f0b016cf82d88553c9a0adb4dde39505ca3d2e5830e79399e4"
+                "name": "gcr.io/knative-releases/knative.dev/net-contour/cmd/controller@sha256",
+                "version": "922ce3f28a1dc618e4ebd62cfdf10216f06543bb70e280277107c4ec3d2e4eac"
             }
         ]
     },
@@ -140,30 +156,54 @@
         ]
     },
     "rabbitmq-operator": {
-        "gitRepoTag": "v1.4.0",
+        "gitRepoTag": "v1.10.0",
         "containers": [{
                 "name": "rabbitmqoperator/cluster-operator",
-                "version": "1.4.0"
-            },
-            {
-                "name": "rabbitmq",
-                "version": "3.8.9-management"
+                "version": "1.10.0"
             }
         ]
     },
     "rabbitmq-broker": {
-        "gitRepoTag": "v0.20.0",
+        "gitRepoTag": "v1.1.0",
         "containers": [{
                 "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/controller/broker@sha256",
-                "version": "11863db6feeada9b34d63c8ef890349f35c4e6c03728462127431c96130c740b"
+                "version": "352d7fd1bf8dfb46a84c324ab11d3e35da786a95428771c66d5b832d1a0f456e"
             },
             {
                 "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/ingress@sha256",
-                "version": "94232a856453d0761bf0ffd1fb13cb2a957591fabac8821c1be796098acc6d62"
+                "version": "dc26d1d72e0ec52836970be0e4fbf966acea221ff9dc167234c5d5fede6d16f8"
             },
             {
                 "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/dispatcher@sha256",
-                "version": "2f99ca7c62a68c213d17c23c17ec92e3b4815cec982631c3050d9ccee38fabcb"
+                "version": "1001eed441e4b438eda8520a3d02ad9f07ef0faae200864fd03caae04d4a7323"
+            },
+            {
+                "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/webhook/broker@sha256",
+                "version": "b69e108a1c439a722346725ed59ad140cd98c7d7220037241842a4489adc441a"
+            }
+        ]
+    },
+    "rabbitmq-messaging-topology-operator": {
+        "gitRepoTag": "v1.2.1",
+        "containers": [{
+                "name": "rabbitmqoperator/messaging-topology-operator",
+                "version": "1.2.1"
+            }
+        ]
+    },
+    "cert-manager": {
+        "gitRepoTag": "v1.5.4",
+        "containers": [{
+                "name": "quay.io/jetstack/cert-manager-cainjector",
+                "version": "v1.5.4"
+            },
+            {
+                "name": "quay.io/jetstack/cert-manager-controller",
+                "version": "v1.5.4"
+            },
+            {
+                "name": "quay.io/jetstack/cert-manager-webhook",
+                "version": "v1.5.4"
             }
         ]
     },