From 92e5f31395261f0c0cd6dc7b1591b24b082b9095 Mon Sep 17 00:00:00 2001
From: James Falkner <schtool@gmail.com>
Date: Thu, 12 Mar 2020 23:16:39 +0100
Subject: [PATCH] Update knative-serving operator workaround (#1321)
---
ansible/roles/ocp4-workload-ccnrd/files/knative-serving-cm.yaml | 498 +++++++++++++++++++++++++------------------------
ansible/roles/ocp4-workload-ccnrd/templates/devfile.json.j2 | 2
ansible/roles/ocp4-workload-ccnrd/tasks/install-serverless.yaml | 4
ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.5.0.csv.yaml | 80 +++-----
4 files changed, 286 insertions(+), 298 deletions(-)
diff --git a/ansible/roles/ocp4-workload-ccnrd/files/knative-serving-cm.yaml b/ansible/roles/ocp4-workload-ccnrd/files/knative-serving-cm.yaml
index 28aab1c..5d65115 100644
--- a/ansible/roles/ocp4-workload-ccnrd/files/knative-serving-cm.yaml
+++ b/ansible/roles/ocp4-workload-ccnrd/files/knative-serving-cm.yaml
@@ -4,7 +4,7 @@
name: ko-data
namespace: openshift-operators
data:
- knative-serving-v0.11.1.yaml: |
+ knative-serving-v0.12.1.yaml: |
---
apiVersion: v1
kind: Namespace
@@ -389,7 +389,7 @@
- knative-internal
- networking
shortNames:
- - ing
+ - kingress
scope: Namespaced
subresources:
status: {}
@@ -656,64 +656,26 @@
type: string
JSONPath: ".status.conditions[?(@.type=='Ready')].reason"
---
- apiVersion: v1
- kind: Service
+ apiVersion: admissionregistration.k8s.io/v1beta1
+ kind: ValidatingWebhookConfiguration
metadata:
- name: activator-service
- namespace: knative-serving
+ name: config.webhook.serving.knative.dev
labels:
- app: activator
serving.knative.dev/release: devel
- spec:
- selector:
- app: activator
- ports:
- - name: http
- protocol: TCP
- port: 80
- targetPort: 8012
- - name: http2
- protocol: TCP
- port: 81
- targetPort: 8013
- - name: http-metrics
- protocol: TCP
- port: 9090
- targetPort: 9090
- type: ClusterIP
- ---
- apiVersion: v1
- kind: Service
- metadata:
- labels:
- app: controller
- serving.knative.dev/release: devel
- name: controller
- namespace: knative-serving
- spec:
- ports:
- - name: http-metrics
- port: 9090
- protocol: TCP
- targetPort: 9090
- selector:
- app: controller
- ---
- apiVersion: v1
- kind: Service
- metadata:
- labels:
- role: webhook
- serving.knative.dev/release: devel
- name: webhook
- namespace: knative-serving
- spec:
- ports:
- - name: https-webhook
- port: 443
- targetPort: 8443
- selector:
- role: webhook
+ webhooks:
+ - admissionReviewVersions:
+ - v1beta1
+ clientConfig:
+ service:
+ name: webhook
+ namespace: knative-serving
+ failurePolicy: Fail
+ sideEffects: None
+ name: config.webhook.serving.knative.dev
+ namespaceSelector:
+ matchExpressions:
+ - key: serving.knative.dev/release
+ operator: Exists
---
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
@@ -729,6 +691,7 @@
name: webhook
namespace: knative-serving
failurePolicy: Fail
+ sideEffects: None
name: webhook.serving.knative.dev
---
apiVersion: admissionregistration.k8s.io/v1beta1
@@ -745,27 +708,8 @@
name: webhook
namespace: knative-serving
failurePolicy: Fail
+ sideEffects: None
name: validation.webhook.serving.knative.dev
- ---
- apiVersion: admissionregistration.k8s.io/v1beta1
- kind: ValidatingWebhookConfiguration
- metadata:
- name: config.webhook.serving.knative.dev
- labels:
- serving.knative.dev/release: devel
- webhooks:
- - admissionReviewVersions:
- - v1beta1
- clientConfig:
- service:
- name: webhook
- namespace: knative-serving
- failurePolicy: Fail
- name: config.webhook.serving.knative.dev
- namespaceSelector:
- matchExpressions:
- - key: serving.knative.dev/release
- operator: Exists
---
apiVersion: v1
kind: Secret
@@ -783,89 +727,7 @@
labels:
serving.knative.dev/release: devel
spec:
- image: quay.io/openshift-knative/knative-serving-queue:v0.11.1
- ---
- apiVersion: apps/v1
- kind: Deployment
- metadata:
- name: activator
- namespace: knative-serving
- labels:
- serving.knative.dev/release: devel
- spec:
- selector:
- matchLabels:
- app: activator
- role: activator
- template:
- metadata:
- annotations:
- cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
- sidecar.istio.io/inject: "true"
- labels:
- app: activator
- role: activator
- serving.knative.dev/release: devel
- spec:
- serviceAccountName: controller
- terminationGracePeriodSeconds: 300
- containers:
- - name: activator
- image: quay.io/openshift-knative/knative-serving-activator:v0.11.1
- env:
- - name: GOGC
- value: 500
- ports:
- - name: http1
- containerPort: 8012
- - name: h2c
- containerPort: 8013
- - name: metrics
- containerPort: 9090
- - name: profiling
- containerPort: 8008
- readinessProbe:
- httpGet:
- path: /healthz
- port: 8012
- httpHeaders:
- - name: k-kubelet-probe
- value: "activator"
- livenessProbe:
- httpGet:
- path: /healthz
- port: 8012
- httpHeaders:
- - name: k-kubelet-probe
- value: "activator"
- resources:
- requests:
- cpu: 300m
- memory: 60Mi
- limits:
- cpu: 1000m
- memory: 600Mi
- env:
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: SYSTEM_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: CONFIG_LOGGING_NAME
- value: config-logging
- - name: CONFIG_OBSERVABILITY_NAME
- value: config-observability
- - name: METRICS_DOMAIN
- value: knative.dev/internal/serving
- securityContext:
- allowPrivilegeEscalation: false
+ image: quay.io/openshift-knative/knative-serving-queue:v0.12.1
---
apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
@@ -890,20 +752,118 @@
apiVersion: apps/v1
kind: Deployment
metadata:
+ name: activator
+ namespace: knative-serving
+ labels:
+ serving.knative.dev/release: devel
+ spec:
+ selector:
+ matchLabels:
+ app: activator
+ role: activator
+ template:
+ metadata:
+ annotations:
+ cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
+ labels:
+ app: activator
+ role: activator
+ serving.knative.dev/release: devel
+ spec:
+ serviceAccountName: controller
+ containers:
+ - name: activator
+ image: quay.io/openshift-knative/knative-serving-activator:v0.12.1
+ resources:
+ requests:
+ cpu: 300m
+ memory: 60Mi
+ limits:
+ cpu: 1000m
+ memory: 600Mi
+ env:
+ - name: GOGC
+ value: "500"
+ - name: POD_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: SYSTEM_NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+ - name: CONFIG_LOGGING_NAME
+ value: config-logging
+ - name: CONFIG_OBSERVABILITY_NAME
+ value: config-observability
+ - name: METRICS_DOMAIN
+ value: knative.dev/internal/serving
+ securityContext:
+ allowPrivilegeEscalation: false
+ ports:
+ - name: metrics
+ containerPort: 9090
+ - name: profiling
+ containerPort: 8008
+ - name: http1
+ containerPort: 8012
+ - name: h2c
+ containerPort: 8013
+ readinessProbe: &probe
+ httpGet:
+ port: 8012
+ httpHeaders:
+ - name: k-kubelet-probe
+ value: "activator"
+ livenessProbe: *probe
+ terminationGracePeriodSeconds: 300
+ ---
+ apiVersion: v1
+ kind: Service
+ metadata:
+ name: activator-service
+ namespace: knative-serving
+ labels:
+ app: activator
+ serving.knative.dev/release: devel
+ spec:
+ selector:
+ app: activator
+ ports:
+ - name: http-metrics
+ port: 9090
+ targetPort: 9090
+ - name: http-profiling
+ port: 8008
+ targetPort: 8008
+ - name: http
+ port: 80
+ targetPort: 8012
+ - name: http2
+ port: 81
+ targetPort: 8013
+ type: ClusterIP
+ ---
+ apiVersion: apps/v1
+ kind: Deployment
+ metadata:
name: autoscaler-hpa
namespace: knative-serving
labels:
serving.knative.dev/release: devel
autoscaling.knative.dev/autoscaler-provider: hpa
spec:
- replicas: 1
selector:
matchLabels:
app: autoscaler-hpa
template:
metadata:
annotations:
- sidecar.istio.io/inject: "false"
+ cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
labels:
app: autoscaler-hpa
serving.knative.dev/release: devel
@@ -911,19 +871,14 @@
serviceAccountName: controller
containers:
- name: autoscaler-hpa
- image: quay.io/openshift-knative/knative-serving-autoscaler-hpa:v0.11.1
+ image: quay.io/openshift-knative/knative-serving-autoscaler-hpa:v0.12.1
resources:
requests:
- cpu: 100m
- memory: 100Mi
+ cpu: 30m
+ memory: 40Mi
limits:
- cpu: 1000m
- memory: 1000Mi
- ports:
- - name: metrics
- containerPort: 9090
- - name: profiling
- containerPort: 8008
+ cpu: 300m
+ memory: 400Mi
env:
- name: SYSTEM_NAMESPACE
valueFrom:
@@ -937,31 +892,31 @@
value: knative.dev/serving
securityContext:
allowPrivilegeEscalation: false
+ ports:
+ - name: metrics
+ containerPort: 9090
+ - name: profiling
+ containerPort: 8008
---
apiVersion: v1
kind: Service
metadata:
labels:
- app: autoscaler
+ app: autoscaler-hpa
serving.knative.dev/release: devel
- name: autoscaler
+ autoscaling.knative.dev/autoscaler-provider: hpa
+ name: autoscaler-hpa
namespace: knative-serving
spec:
ports:
- - name: http
- port: 8080
- protocol: TCP
- targetPort: 8080
- name: http-metrics
port: 9090
- protocol: TCP
targetPort: 9090
- - name: https-custom-metrics
- port: 443
- protocol: TCP
- targetPort: 8443
+ - name: http-profiling
+ port: 8008
+ targetPort: 8008
selector:
- app: autoscaler
+ app: autoscaler-hpa
---
apiVersion: apps/v1
kind: Deployment
@@ -979,8 +934,6 @@
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
- sidecar.istio.io/inject: "true"
- traffic.sidecar.istio.io/includeInboundPorts: "8080,9090"
labels:
app: autoscaler
serving.knative.dev/release: devel
@@ -988,21 +941,7 @@
serviceAccountName: controller
containers:
- name: autoscaler
- image: quay.io/openshift-knative/knative-serving-autoscaler:v0.11.1
- readinessProbe:
- httpGet:
- path: /healthz
- port: 8080
- httpHeaders:
- - name: k-kubelet-probe
- value: "autoscaler"
- livenessProbe:
- httpGet:
- path: /healthz
- port: 8080
- httpHeaders:
- - name: k-kubelet-probe
- value: "autoscaler"
+ image: quay.io/openshift-knative/knative-serving-autoscaler:v0.12.1
resources:
requests:
cpu: 30m
@@ -1010,18 +949,6 @@
limits:
cpu: 300m
memory: 400Mi
- ports:
- - name: websocket
- containerPort: 8080
- - name: metrics
- containerPort: 9090
- - name: custom-metrics
- containerPort: 8443
- - name: profiling
- containerPort: 8008
- args:
- - "--secure-port=8443"
- - "--cert-dir=/tmp"
env:
- name: SYSTEM_NAMESPACE
valueFrom:
@@ -1035,6 +962,50 @@
value: knative.dev/serving
securityContext:
allowPrivilegeEscalation: false
+ ports:
+ - name: metrics
+ containerPort: 9090
+ - name: profiling
+ containerPort: 8008
+ - name: websocket
+ containerPort: 8080
+ - name: custom-metrics
+ containerPort: 8443
+ readinessProbe: &probe
+ httpGet:
+ port: 8080
+ httpHeaders:
+ - name: k-kubelet-probe
+ value: "autoscaler"
+ livenessProbe: *probe
+ args:
+ - "--secure-port=8443"
+ - "--cert-dir=/tmp"
+ ---
+ apiVersion: v1
+ kind: Service
+ metadata:
+ labels:
+ app: autoscaler
+ serving.knative.dev/release: devel
+ name: autoscaler
+ namespace: knative-serving
+ spec:
+ ports:
+ - name: http-metrics
+ port: 9090
+ targetPort: 9090
+ - name: http-profiling
+ port: 8008
+ targetPort: 8008
+ - name: http
+ port: 8080
+ targetPort: 8080
+ - name: https-custom-metrics
+ port: 443
+ targetPort: 8443
+ selector:
+ app: autoscaler
---
apiVersion: v1
kind: ConfigMap
@@ -1057,6 +1028,7 @@
enable-scale-to-zero: "true"
tick-interval: "2s"
scale-to-zero-grace-period: "30s"
+ enable-graceful-scaledown: "false"
---
apiVersion: v1
kind: ConfigMap
@@ -1084,7 +1056,7 @@
labels:
serving.knative.dev/release: devel
data:
- queueSidecarImage: quay.io/openshift-knative/knative-serving-queue:v0.11.1
+ queueSidecarImage: quay.io/openshift-knative/knative-serving-queue:v0.12.1
_example: |
registriesSkippingTagResolving: "ko.local,dev.local"
---
@@ -1114,9 +1086,9 @@
serving.knative.dev/release: devel
data:
_example: |
- stale-revision-create-delay: "24h"
+ stale-revision-create-delay: "48h"
stale-revision-timeout: "15h"
- stale-revision-minimum-generations: "1"
+ stale-revision-minimum-generations: "20"
stale-revision-lastpinned-debounce: "5h"
---
apiVersion: v1
@@ -1132,7 +1104,6 @@
gateway.knative-serving.knative-ingress-gateway: "istio-ingressgateway.istio-system.svc.cluster.local"
local-gateway.knative-serving.cluster-local-gateway: "cluster-local-gateway.istio-system.svc.cluster.local"
local-gateway.mesh: "mesh"
- reconcileExternalGateway: "false"
---
apiVersion: v1
kind: ConfigMap
@@ -1180,7 +1151,6 @@
data:
_example: |
istio.sidecar.includeOutboundIPRanges: "*"
- clusteringress.class: "istio.ingress.networking.knative.dev"
ingress.class: "istio.ingress.networking.knative.dev"
certificate.class: "cert-manager.certificate.networking.internal.knative.dev"
domainTemplate: "{{.Name}}.{{.Namespace}}.{{.Domain}}"
@@ -1231,14 +1201,13 @@
labels:
serving.knative.dev/release: devel
spec:
- replicas: 1
selector:
matchLabels:
app: controller
template:
metadata:
annotations:
- sidecar.istio.io/inject: "false"
+ cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
labels:
app: controller
serving.knative.dev/release: devel
@@ -1246,7 +1215,7 @@
serviceAccountName: controller
containers:
- name: controller
- image: quay.io/openshift-knative/knative-serving-controller:v0.11.1
+ image: quay.io/openshift-knative/knative-serving-controller:v0.12.1
resources:
requests:
cpu: 100m
@@ -1254,11 +1223,6 @@
limits:
cpu: 1000m
memory: 1000Mi
- ports:
- - name: metrics
- containerPort: 9090
- - name: profiling
- containerPort: 8008
env:
- name: SYSTEM_NAMESPACE
valueFrom:
@@ -1272,6 +1236,30 @@
value: knative.dev/internal/serving
securityContext:
allowPrivilegeEscalation: false
+ ports:
+ - name: metrics
+ containerPort: 9090
+ - name: profiling
+ containerPort: 8008
+ ---
+ apiVersion: v1
+ kind: Service
+ metadata:
+ labels:
+ app: controller
+ serving.knative.dev/release: devel
+ name: controller
+ namespace: knative-serving
+ spec:
+ ports:
+ - name: http-metrics
+ port: 9090
+ targetPort: 9090
+ - name: http-profiling
+ port: 8008
+ targetPort: 8008
+ selector:
+ app: controller
---
apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService
@@ -1299,13 +1287,13 @@
serving.knative.dev/release: devel
networking.knative.dev/ingress-provider: istio
spec:
- replicas: 1
selector:
matchLabels:
app: networking-istio
template:
metadata:
annotations:
+ cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
sidecar.istio.io/inject: "false"
labels:
app: networking-istio
@@ -1314,19 +1302,14 @@
serviceAccountName: controller
containers:
- name: networking-istio
- image: quay.io/openshift-knative/knative-serving-istio:v0.11.1
+ image: quay.io/openshift-knative/knative-serving-istio:v0.12.1
resources:
requests:
- cpu: 100m
- memory: 100Mi
+ cpu: 30m
+ memory: 40Mi
limits:
- cpu: 1000m
- memory: 1000Mi
- ports:
- - name: metrics
- containerPort: 9090
- - name: profiling
- containerPort: 8008
+ cpu: 300m
+ memory: 400Mi
env:
- name: SYSTEM_NAMESPACE
valueFrom:
@@ -1340,6 +1323,11 @@
value: knative.dev/serving
securityContext:
allowPrivilegeEscalation: false
+ ports:
+ - name: metrics
+ containerPort: 9090
+ - name: profiling
+ containerPort: 8008
---
apiVersion: apps/v1
kind: Deployment
@@ -1349,7 +1337,6 @@
labels:
serving.knative.dev/release: devel
spec:
- replicas: 1
selector:
matchLabels:
app: webhook
@@ -1358,7 +1345,6 @@
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
- sidecar.istio.io/inject: "false"
labels:
app: webhook
role: webhook
@@ -1367,12 +1353,7 @@
serviceAccountName: controller
containers:
- name: webhook
- image: quay.io/openshift-knative/knative-serving-webhook:v0.11.1
- ports:
- - name: metrics
- containerPort: 9090
- - name: profiling
- containerPort: 8008
+ image: quay.io/openshift-knative/knative-serving-webhook:v0.12.1
resources:
requests:
cpu: 20m
@@ -1393,3 +1374,30 @@
value: knative.dev/serving
securityContext:
allowPrivilegeEscalation: false
+ ports:
+ - name: metrics
+ containerPort: 9090
+ - name: profiling
+ containerPort: 8008
+ ---
+ apiVersion: v1
+ kind: Service
+ metadata:
+ labels:
+ role: webhook
+ serving.knative.dev/release: devel
+ name: webhook
+ namespace: knative-serving
+ spec:
+ ports:
+ - name: http-metrics
+ port: 9090
+ targetPort: 9090
+ - name: http-profiling
+ port: 8008
+ targetPort: 8008
+ - name: https-webhook
+ port: 443
+ targetPort: 8443
+ selector:
+ role: webhook
\ No newline at end of file
diff --git a/ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.4.1.csv.yaml b/ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.5.0.csv.yaml
similarity index 85%
rename from ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.4.1.csv.yaml
rename to ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.5.0.csv.yaml
index 3fb2043..bcd727f 100644
--- a/ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.4.1.csv.yaml
+++ b/ansible/roles/ocp4-workload-ccnrd/files/serverless-operator.v1.5.0.csv.yaml
@@ -3,7 +3,6 @@
metadata:
annotations:
certified: 'false'
- olm.targetNamespaces: ''
repository: 'https://github.com/openshift-knative/serverless-operator'
support: 'Red Hat, Inc.'
alm-examples: |-
@@ -66,18 +65,16 @@
capabilities: Seamless Upgrades
olm.operatorNamespace: openshift-operators
containerImage: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/knative-rhel8-operator@sha256:4a20e629496ef5c693614a600c05a8cf6712d5cf3443aa991fa556338568438e
+ registry.redhat.io/openshift-serverless-1-tech-preview/knative-rhel8-operator@sha256:55623cc6982e3b25d2077d6331f74d784f366eb2af1835f4b923be583e3bb35b
categories: 'Networking,Integration & Delivery,Cloud Provider,Developer Tools'
description: >-
Provides a collection of API's based on Knative to support deploying and
serving
of serverless applications and functions.
olm.operatorGroup: global-operators
- name: serverless-operator.v1.4.1
+ name: serverless-operator.v1.5.0
namespace: openshift-operators
labels:
- olm.api.1d316f16185c2e24: required
- olm.api.362f21bbb2de66a0: required
olm.api.75423c66e1c26296: provided
olm.api.fceaacb4e1c6ac8c: provided
spec:
@@ -111,17 +108,6 @@
x-descriptors:
- 'urn:alm:descriptor:io.kubernetes.conditions'
version: v1alpha1
- required:
- - description: A list of namespaces in Service Mesh
- displayName: Istio Service Mesh Member Roll
- kind: ServiceMeshMemberRoll
- name: servicemeshmemberrolls.maistra.io
- version: v1
- - description: An Istio control plane installation
- displayName: Istio Service Mesh Control Plane
- kind: ServiceMeshControlPlane
- name: servicemeshcontrolplanes.maistra.io
- version: v1
apiservicedefinitions: {}
keywords:
- serverless
@@ -143,12 +129,12 @@
type: MultiNamespace
- supported: true
type: AllNamespaces
- version: 1.4.1
+ version: 1.5.0
icon:
- base64data: >-
PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMzQwMDt9LmNscy0ye2ZpbGw6I2NlMmUwMDt9LmNscy0ze2ZpbGw6bm9uZTt9LmNscy00e2ZpbGw6I2ZmZjt9LmNscy01e2ZpbGw6I2RjZGNkYzt9LmNscy02e2ZpbGw6I2FhYTt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZF9IYXQtT3BlbnNoaWZ0NC1DYXRhbG9nX0ljb25zLVNlcnZlcmxlc3M8L3RpdGxlPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik04NS4zNiwxNC42NEE1MCw1MCwwLDAsMSwxNC42NCw4NS4zNloiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik00MC41Nyw0Ny40MmEzLjg5LDMuODksMCwxLDAsMy44OCwzLjg4QTMuODksMy44OSwwLDAsMCw0MC41Nyw0Ny40MloiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMS40Miw0Ny40MkEzLjg5LDMuODksMCwxLDAsMjUuMyw1MS4zLDMuODksMy44OSwwLDAsMCwyMS40Miw0Ny40MloiLz48cGF0aCBjbGFzcz0iY2xzLTQiIGQ9Ik01MC4wOSw0OC44NmgtLjE4YTQuMTEsNC4xMSwwLDAsMS0zLjI2LTEuNjMsNy42OSw3LjY5LDAsMCwwLTEyLjE2LDAsNC4xMyw0LjEzLDAsMCwxLTMuMjYsMS42M0gzMWE0LjA5LDQuMDksMCwwLDEtMy4yNS0xLjYzQTcuNjksNy42OSwwLDAsMCwxNCw1MS45M2gwVjY0LjZhMi43OSwyLjc5LDAsMCwwLDIuNzksMi43OWgxNS44TDUxLjM0LDQ4LjY2QTQsNCwwLDAsMSw1MC4wOSw0OC44NloiLz48cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik03OC4wNSw0NC4yNWE3LjY1LDcuNjUsMCwwLDAtNS44NSwzQTQuMSw0LjEsMCwwLDEsNjksNDguODZoLS4xOWE0LjEzLDQuMTMsMCwwLDEtMy4yNi0xLjYzLDcuNjksNy42OSwwLDAsMC0xMi4xNiwwLDQuMTYsNC4xNiwwLDAsMS0yLDEuNDNMMzIuNjEsNjcuMzlIODMuMTlBMi43OSwyLjc5LDAsMCwwLDg2LDY0LjZWNTIuMDdBNy43Nyw3Ljc3LDAsMCwwLDc4LjA1LDQ0LjI1WiIvPjxwYXRoIGNsYXNzPSJjbHMtNiIgZD0iTTIxLjEsNjNoMTBhMS44MywxLjgzLDAsMSwwLDAtMy42NmgtMTBhMS44MywxLjgzLDAsMCwwLDAsMy42NloiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjQwLjU3IiBjeT0iMzcuNzMiIHI9IjIuMTUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjQwLjU3IiBjeT0iMjguMjMiIHI9IjEuMzUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjU5LjcyIiBjeT0iMjguMjMiIHI9IjEuMzUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjIxLjQyIiBjeT0iMzcuNzMiIHI9IjIuMTUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjUwIiBjeT0iNDMuNDUiIHI9IjIuOTMiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjY4Ljg5IiBjeT0iNDMuNDUiIHI9IjIuOTMiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjMxLjA5IiBjeT0iNDMuNDUiIHI9IjIuOTMiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNiIgY3g9Ijc3Ljk0IiBjeT0iNTQuMzEiIHI9IjIuMTUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNiIgY3g9IjY4LjkxIiBjeT0iNTQuMzEiIHI9IjIuMTUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9Ijc3Ljk0IiBjeT0iMzcuNzMiIHI9IjIuMTUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjU5LjcyIiBjeT0iMzcuNzMiIHI9IjIuMTUiLz48Y2lyY2xlIGNsYXNzPSJjbHMtNCIgY3g9IjUwIiBjeT0iMzMuMSIgcj0iMy4wMSIvPjxjaXJjbGUgY2xhc3M9ImNscy00IiBjeD0iMzEuMDkiIGN5PSIzMy4xIiByPSIzLjAxIi8+PGNpcmNsZSBjbGFzcz0iY2xzLTQiIGN4PSI2OC44OSIgY3k9IjMzLjEiIHI9IjMuMDEiLz48L3N2Zz4=
mediatype: image/svg+xml
- minKubeVersion: 1.14.0
+ minKubeVersion: 1.15.0
links:
- name: Documentation
url: >-
@@ -235,12 +221,6 @@
- knativeservings/finalizers
verbs:
- '*'
- - apiGroups:
- - maistra.io
- resources:
- - servicemeshmemberrolls
- verbs:
- - '*'
serviceAccountName: knative-openshift-ingress
deployments:
- name: knative-serving-operator
@@ -273,7 +253,7 @@
- name: KO_DATA_PATH
value: /tmp/
image: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/knative-serving-rhel8-operator@sha256:dc004a3fe9b1bd2f8b3721b0bcbe4e35b4a96e92a5f306b14c8e18dd51e51225
+ registry.redhat.io/openshift-serverless-1-tech-preview/knative-serving-rhel8-operator@sha256:06847407883d00871a19b9183824d77895e68aa6439d80e0e4a4eb4151ec1c86
imagePullPolicy: IfNotPresent
name: knative-serving-operator
ports:
@@ -286,8 +266,8 @@
volumes:
- configMap:
items:
- - key: knative-serving-v0.11.1.yaml
- path: knative-serving-v0.11.1.yaml
+ - key: knative-serving-v0.12.1.yaml
+ path: knative-serving-v0.12.1.yaml
name: ko-data
name: release-manifest
- name: knative-serving-openshift
@@ -315,32 +295,37 @@
- name: OPERATOR_NAME
value: knative-serving-openshift
- name: MIN_OPENSHIFT_VERSION
- value: 4.1.13
+ value: 4.3.0
- name: REQUIRED_NAMESPACE
value: knative-serving
+ - name: KOURIER_MANIFEST_PATH
+ value: deploy/resources/kourier/kourier-latest.yaml
- name: IMAGE_queue-proxy
value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-queue-rhel8@sha256:f9ea8bd70789e67ff00cc134cd966fda8d9e7a764926551d650acc71776db73c
- - name: IMAGE_networking-istio
- value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-networking-istio-rhel8@sha256:4e19f90b1aea1b7f4ba04f5d6b659f33a27904b37ca3f500e4aa982a9730b48b
+ registry.redhat.io/openshift-serverless-1-tech-preview/serving-queue-rhel8@sha256:63d3b837aacbec5967063be5eada4ab65b733f0dba088a6f9c518c5c1b409c9a
- name: IMAGE_activator
value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-activator-rhel8@sha256:529b5c5f27caea6ab664fbc47b74fafa1edf4913e652d02c64ace21829da4cfe
+ registry.redhat.io/openshift-serverless-1-tech-preview/serving-activator-rhel8@sha256:b0c7030f235ec828a975ecc990e34ae2dc3bf88188c1f243f5568bd1a749c0e9
- name: IMAGE_autoscaler
value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-autoscaler-rhel8@sha256:b2e1337b701a831e5832c71cc759c8bea959bc275c03aaf11a047cfc17779ae0
+ registry.redhat.io/openshift-serverless-1-tech-preview/serving-autoscaler-rhel8@sha256:2a3dade388c15f6c839b4e746e2ae80bc4a22c727a01d5c2d3f06609b234c08f
- name: IMAGE_autoscaler-hpa
value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-autoscaler-hpa-rhel8@sha256:e400785e44de44655aa1c6419362f5c8f23fce2f775e4ebc4cc62487356238b7
+ registry.redhat.io/openshift-serverless-1-tech-preview/serving-autoscaler-hpa-rhel8@sha256:98a68724567a8f6737223d5edccfd4021312649338c63742b6ccf1c08c89aabc
- name: IMAGE_controller
value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-controller-rhel8@sha256:342bd8de71721eab64bf842453a701cfe82e99954f5fa29095821f84ea61388e
+ registry.redhat.io/openshift-serverless-1-tech-preview/serving-controller-rhel8@sha256:e655d181bb8b50114f133c86cea6aaf1d1f6e00b848aaa6b94e0efdba2642959
- name: IMAGE_webhook
value: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/serving-webhook-rhel8@sha256:8b966f57f45923465316f63eed438d094a4c64deeb07344048f3e7a8b5a88d3a
+ registry.redhat.io/openshift-serverless-1-tech-preview/serving-webhook-rhel8@sha256:a3dd1619be816b6cc673ed4e3a610ae6832a1216841258356ce36687c90fb7f1
+ - name: IMAGE_3scale-kourier-gateway
+ value: >-
+ registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:be1e61060e5663bc628147a1a56e16dd1fdba7a0f200eda75c6d997c18e15306
+ - name: IMAGE_3scale-kourier-control
+ value: >-
+ registry.redhat.io/openshift-serverless-1-tech-preview/kourier-control-rhel8@sha256:94106df34f035678962b3bf644f432b59e81b9978536d0827feb8cafac52831c
image: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/knative-rhel8-operator@sha256:4a20e629496ef5c693614a600c05a8cf6712d5cf3443aa991fa556338568438e
+ registry.redhat.io/openshift-serverless-1-tech-preview/knative-rhel8-operator@sha256:55623cc6982e3b25d2077d6331f74d784f366eb2af1835f4b923be583e3bb35b
imagePullPolicy: Always
name: knative-serving-openshift
serviceAccountName: knative-serving-operator
@@ -368,7 +353,7 @@
- name: OPERATOR_NAME
value: knative-openshift-ingress
image: >-
- registry.redhat.io/openshift-serverless-1-tech-preview/ingress-rhel8-operator@sha256:43abf91f54a4679acc5d29bcfd6420d882b0eaddea5ed4a906bd25f8a54b8f4f
+ registry.redhat.io/openshift-serverless-1-tech-preview/ingress-rhel8-operator@sha256:77d4e74c63b6f0930e2ecf14c611c17cd0d288b1216422476d909e655f5ee827
imagePullPolicy: Always
name: knative-openshift-ingress
serviceAccountName: knative-openshift-ingress
@@ -455,7 +440,7 @@
- Automatic scaling up and down to zero
- - Routing and network programming for Istio components
+ - Routing and network programming
- Point-in-time snapshots of deployed code and configurations
@@ -467,11 +452,10 @@
have certain requirements with regards to the size of the underlying
- cluster and a working installation of Service Mesh. See the [installation
+ cluster. See [Getting started with OpenShift
+ Serverless](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.3/html-single/serverless_applications/index#serverless-getting-started)
- section](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.2/html-single/serverless/index#installing-openshift-serverless)
-
- of the Serverless documentation for more info.
+ for more info.
## Further Information
@@ -480,9 +464,5 @@
For documentation on using Knative Serving, see the
[serving
- section](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.2/html-single/serverless/index#knative-serving_serverless-architecture)
- of the
-
- [Serverless documentation
- site](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.2/html-single/serverless/index).
- replaces: serverless-operator.v1.4.0
+ section](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.3/html-single/serverless_applications/index#knative-serving).
+ replaces: serverless-operator.v1.4.1
diff --git a/ansible/roles/ocp4-workload-ccnrd/tasks/install-serverless.yaml b/ansible/roles/ocp4-workload-ccnrd/tasks/install-serverless.yaml
index 4f4be91..bbe2609 100644
--- a/ansible/roles/ocp4-workload-ccnrd/tasks/install-serverless.yaml
+++ b/ansible/roles/ocp4-workload-ccnrd/tasks/install-serverless.yaml
@@ -65,13 +65,13 @@
k8s:
api_version: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
- name: serverless-operator.v1.4.1
+ name: serverless-operator.v1.5.0
namespace: openshift-operators
state: present
merge_type:
- strategic-merge
- merge
- definition: "{{ lookup('file', './files/serverless-operator.v1.4.1.csv.yaml' ) | from_yaml }}"
+ definition: "{{ lookup('file', './files/serverless-operator.v1.5.0.csv.yaml' ) | from_yaml }}"
register: r_serving_crd_update
retries: 200
delay: 10
diff --git a/ansible/roles/ocp4-workload-ccnrd/templates/devfile.json.j2 b/ansible/roles/ocp4-workload-ccnrd/templates/devfile.json.j2
index 42f0492..7d70a67 100644
--- a/ansible/roles/ocp4-workload-ccnrd/templates/devfile.json.j2
+++ b/ansible/roles/ocp4-workload-ccnrd/templates/devfile.json.j2
@@ -10,7 +10,7 @@
},
{
"mountSources": true,
- "memoryLimit": "3Gi",
+ "memoryLimit": "4Gi",
"type": "dockerimage",
"alias": "quarkus-tools",
"image": "image-registry.openshift-image-registry.svc:5000/openshift/quarkus-stack:1.5",
--
Gitblit v1.9.3