Merge branch 'release-v1.11' into cp-1c39cb917-v1.11

openshift-knative · Aug 30, 2023 · 6ca80ab · 6ca80ab
2 parents a8363ad + 91d4345
commit 6ca80ab
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 62 deletions.
diff --git a/control-plane/config/eventing-kafka-broker/200-controller/100-config-tracing.yaml b/control-plane/config/eventing-kafka-broker/200-controller/100-config-tracing.yaml
diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile
@@ -11,7 +11,7 @@ RUN echo "[kubernetes]" >> /etc/yum.repos.d/kubernetes.repo && \
     echo "repo_gpgcheck=0" >> /etc/yum.repos.d/kubernetes.repo && \
     echo "gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg" >> /etc/yum.repos.d/kubernetes.repo
 
-RUN yum install -y kubectl httpd-tools
+RUN yum install -y kubectl httpd-tools helm
 
 RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
 

diff --git a/openshift/release/artifacts/eventing-kafka-broker.yaml b/openshift/release/artifacts/eventing-kafka-broker.yaml
@@ -418,6 +418,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: config-kafka-broker-data-plane
           configMap:
@@ -600,6 +602,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: kafka-broker-brokers-triggers
           configMap:

diff --git a/openshift/release/artifacts/eventing-kafka-channel.yaml b/openshift/release/artifacts/eventing-kafka-channel.yaml
@@ -417,6 +417,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: config-kafka-channel-data-plane
           configMap:
@@ -599,6 +601,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: kafka-channel-channels-subscriptions
           configMap:

diff --git a/openshift/release/artifacts/eventing-kafka-controller.yaml b/openshift/release/artifacts/eventing-kafka-controller.yaml
@@ -2044,6 +2044,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       restartPolicy: Always
 ---
 ---
@@ -2429,6 +2431,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
 
           ports:
             - name: https-webhook

diff --git a/openshift/release/artifacts/eventing-kafka-post-install.yaml b/openshift/release/artifacts/eventing-kafka-post-install.yaml
@@ -250,6 +250,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
 ---
 # Copyright 2020 The Knative Authors
 #
@@ -303,3 +305,5 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
diff --git a/openshift/release/artifacts/eventing-kafka-sink.yaml b/openshift/release/artifacts/eventing-kafka-sink.yaml
@@ -342,6 +342,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: kafka-sink-sinks
           configMap:

diff --git a/openshift/release/artifacts/eventing-kafka-source.yaml b/openshift/release/artifacts/eventing-kafka-source.yaml
@@ -370,13 +370,16 @@ spec:
             - name: WAIT_STARTUP_SECONDS
               value: "8"
             - name: JAVA_TOOL_OPTIONS
-              value: "-XX:+CrashOnOutOfMemoryError"
+              value: "-XX:+CrashOnOutOfMemoryError -XX:InitialRAMPercentage=70.0 -XX:MinRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0"
 
           resources:
             requests:
               cpu: 1000m
               # 600Mi for virtual replicas + 100Mi overhead
               memory: 700Mi
+            limits:
+              cpu: 2000m
+              memory: 1000Mi
 
           livenessProbe:
             failureThreshold: 3
@@ -404,6 +407,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: config-kafka-source-data-plane
           configMap:

diff --git a/openshift/release/artifacts/eventing-kafka.yaml b/openshift/release/artifacts/eventing-kafka.yaml
@@ -2044,6 +2044,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       restartPolicy: Always
 ---
 ---
@@ -2429,6 +2431,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
 
           ports:
             - name: https-webhook
@@ -2727,6 +2731,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
 ---
 # Copyright 2020 The Knative Authors
 #
@@ -2780,6 +2786,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
 ---
 # Copyright 2021 The Knative Authors
 #
@@ -3152,13 +3160,16 @@ spec:
             - name: WAIT_STARTUP_SECONDS
               value: "8"
             - name: JAVA_TOOL_OPTIONS
-              value: "-XX:+CrashOnOutOfMemoryError"
+              value: "-XX:+CrashOnOutOfMemoryError -XX:InitialRAMPercentage=70.0 -XX:MinRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0"
 
           resources:
             requests:
               cpu: 1000m
               # 600Mi for virtual replicas + 100Mi overhead
               memory: 700Mi
+            limits:
+              cpu: 2000m
+              memory: 1000Mi
 
           livenessProbe:
             failureThreshold: 3
@@ -3186,6 +3197,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: config-kafka-source-data-plane
           configMap:
@@ -3622,6 +3635,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: config-kafka-broker-data-plane
           configMap:
@@ -3804,6 +3819,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: kafka-broker-brokers-triggers
           configMap:
@@ -4278,6 +4295,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: config-kafka-channel-data-plane
           configMap:
@@ -4460,6 +4479,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: kafka-channel-channels-subscriptions
           configMap:
@@ -4857,6 +4878,8 @@ spec:
             capabilities:
               drop:
               - ALL
+            seccompProfile:
+              type: RuntimeDefault
       volumes:
         - name: kafka-sink-sinks
           configMap:

diff --git a/vendor/knative.dev/eventing/hack/update-cert-manager.sh b/vendor/knative.dev/eventing/hack/update-cert-manager.sh