From 2264f4865f8e4f472379284590e0d81f611a6bda Mon Sep 17 00:00:00 2001 From: mvlassis Date: Mon, 8 Jul 2024 13:38:03 +0300 Subject: [PATCH 1/5] chore: update manifests --- .../src/manifests/auth_manifests.yaml.j2 | 16 ++++++++-------- .../src/manifests/secret_manifests.yaml.j2 | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 b/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 index e9d76f22..86714bc0 100644 --- a/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 +++ b/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 @@ -878,8 +878,8 @@ kind: ClusterRoleBinding metadata: name: knative-serving-operator-aggregated labels: - operator.knative.dev/release: "v1.12.3" - app.kubernetes.io/version: "1.12.3" + operator.knative.dev/release: "v1.12.4" + app.kubernetes.io/version: "1.12.4" app.kubernetes.io/part-of: knative-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -895,8 +895,8 @@ kind: ClusterRoleBinding metadata: name: knative-serving-operator-aggregated-stable labels: - operator.knative.dev/release: "v1.12.3" - app.kubernetes.io/version: "1.12.3" + operator.knative.dev/release: "v1.12.4" + app.kubernetes.io/version: "1.12.4" app.kubernetes.io/part-of: knative-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -912,8 +912,8 @@ kind: ClusterRoleBinding metadata: name: knative-eventing-operator-aggregated labels: - operator.knative.dev/release: "v1.12.3" - app.kubernetes.io/version: "1.12.3" + operator.knative.dev/release: "v1.12.4" + app.kubernetes.io/version: "1.12.4" app.kubernetes.io/part-of: knative-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -929,8 +929,8 @@ kind: ClusterRoleBinding metadata: name: knative-eventing-operator-aggregated-stable labels: - operator.knative.dev/release: "v1.12.3" - app.kubernetes.io/version: "1.12.3" + operator.knative.dev/release: "v1.12.4" + app.kubernetes.io/version: "1.12.4" app.kubernetes.io/part-of: knative-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charms/knative-operator/src/manifests/secret_manifests.yaml.j2 b/charms/knative-operator/src/manifests/secret_manifests.yaml.j2 index 97375dd9..75ce9b8f 100644 --- a/charms/knative-operator/src/manifests/secret_manifests.yaml.j2 +++ b/charms/knative-operator/src/manifests/secret_manifests.yaml.j2 @@ -20,7 +20,7 @@ metadata: namespace: {{ namespace }} labels: app.kubernetes.io/component: operator-webhook - operator.knative.dev/release: "v1.12.3" - app.kubernetes.io/version: "v1.12.3" + operator.knative.dev/release: "v1.12.4" + app.kubernetes.io/version: "v1.12.4" app.kubernetes.io/name: knative-operator # The data is populated at install time. From 4d24f3558a75db447c55666a63075d7f8bf6df87 Mon Sep 17 00:00:00 2001 From: mvlassis Date: Mon, 8 Jul 2024 13:46:12 +0300 Subject: [PATCH 2/5] Move position of 'source' to the top, similar to the other .j2 files --- charms/knative-operator/src/manifests/auth_manifests.yaml.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 b/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 index 86714bc0..fbfe0f25 100644 --- a/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 +++ b/charms/knative-operator/src/manifests/auth_manifests.yaml.j2 @@ -1,3 +1,4 @@ +# Source: knative/operator/config/rbac/clusterrole_aggregated.yaml # Copyright 2020 The Knative Authors # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Source: knative/operator/config/rbac/clusterrole_aggregated.yaml + apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: From ce155c8e73f6535be3c0f9bbb81f3632ff1ccd22 Mon Sep 17 00:00:00 2001 From: mvlassis Date: Mon, 8 Jul 2024 13:48:07 +0300 Subject: [PATCH 3/5] Update metadata.yaml --- charms/knative-operator/metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charms/knative-operator/metadata.yaml b/charms/knative-operator/metadata.yaml index 257143a7..e5d5070d 100644 --- a/charms/knative-operator/metadata.yaml +++ b/charms/knative-operator/metadata.yaml @@ -24,8 +24,8 @@ resources: knative-operator-image: type: oci-image description: OCI image for knative-operator - upstream-source: gcr.io/knative-releases/knative.dev/operator/cmd/operator:v1.12.3 + upstream-source: gcr.io/knative-releases/knative.dev/operator/cmd/operator:v1.12.4 knative-operator-webhook-image: type: oci-image description: OCI image for knative-operator's operator-webhook component - upstream-source: gcr.io/knative-releases/knative.dev/operator/cmd/webhook:v1.12.3 + upstream-source: gcr.io/knative-releases/knative.dev/operator/cmd/webhook:v1.12.4 From 28548ec827ba87c16d918a896a1fe7b5e859a201 Mon Sep 17 00:00:00 2001 From: mvlassis Date: Mon, 8 Jul 2024 13:59:54 +0300 Subject: [PATCH 4/5] Update config.yaml for knative-eventing and knative-serving --- charms/knative-eventing/config.yaml | 2 +- charms/knative-serving/config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charms/knative-eventing/config.yaml b/charms/knative-eventing/config.yaml index 0ac2e798..54fa261e 100644 --- a/charms/knative-eventing/config.yaml +++ b/charms/knative-eventing/config.yaml @@ -3,7 +3,7 @@ options: version: - default: "1.12.3" + default: "1.12.6" description: Version of knative-eventing component. type: string namespace: diff --git a/charms/knative-serving/config.yaml b/charms/knative-serving/config.yaml index 052500bf..bf6b3063 100644 --- a/charms/knative-serving/config.yaml +++ b/charms/knative-serving/config.yaml @@ -3,7 +3,7 @@ options: version: - default: "1.12.3" + default: "1.12.4" description: Version of knative-serving component. type: string namespace: From 404e02957fb73ecbc2c43369a17a9da564b26f77 Mon Sep 17 00:00:00 2001 From: mvlassis Date: Tue, 9 Jul 2024 14:01:14 +0300 Subject: [PATCH 5/5] Change version of knative-eventing --- charms/knative-eventing/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charms/knative-eventing/config.yaml b/charms/knative-eventing/config.yaml index 54fa261e..6efe2760 100644 --- a/charms/knative-eventing/config.yaml +++ b/charms/knative-eventing/config.yaml @@ -3,7 +3,7 @@ options: version: - default: "1.12.6" + default: "1.12.4" description: Version of knative-eventing component. type: string namespace: