From c3f7f8d804e97b7147dc31272d02c56214d2d443 Mon Sep 17 00:00:00 2001 From: Darren Lau Date: Fri, 28 Jan 2022 03:09:50 -0500 Subject: [PATCH 1/3] Update istio-operator API to v2.11.6 (#757) --- go.mod | 2 +- go.sum | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6b291fea11..cee4cbe764 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/banzaicloud/cluster-registry v0.0.7 github.com/banzaicloud/go-cruise-control v0.0.0-20220121135324-9178f00469c5 github.com/banzaicloud/istio-client-go v0.0.15 - github.com/banzaicloud/istio-operator/api/v2 v2.11.5 + github.com/banzaicloud/istio-operator/api/v2 v2.11.6 github.com/banzaicloud/k8s-objectmatcher v1.7.0 github.com/banzaicloud/koperator/api v0.0.0 github.com/banzaicloud/koperator/properties v0.1.0 diff --git a/go.sum b/go.sum index 072fe94e98..5df52dbe94 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/banzaicloud/go-cruise-control v0.0.0-20220121135324-9178f00469c5/go.m github.com/banzaicloud/istio-client-go v0.0.11/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I= github.com/banzaicloud/istio-client-go v0.0.15 h1:F2rr1tI/+19kDddLawft8scT8mGLNgBq23gV+I0zsh4= github.com/banzaicloud/istio-client-go v0.0.15/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I= -github.com/banzaicloud/istio-operator/api/v2 v2.11.5 h1:3L6gfMy1fdH229RJlh/lOIi+ru/jRJt+R1OFYDJi+c0= -github.com/banzaicloud/istio-operator/api/v2 v2.11.5/go.mod h1:od/KmI8+QoNB4CZxw593Wpn3MqrCoYPwbno7Gi+QsUM= +github.com/banzaicloud/istio-operator/api/v2 v2.11.6 h1:nl8u4OGdBbu2VX6QZnnniOWCWGQe0jnsgYp9FiB4MEA= +github.com/banzaicloud/istio-operator/api/v2 v2.11.6/go.mod h1:od/KmI8+QoNB4CZxw593Wpn3MqrCoYPwbno7Gi+QsUM= github.com/banzaicloud/k8s-objectmatcher v1.5.0/go.mod h1:9MWY5HsM/OaTmoTirczhlO8UALbH722WgdpaaR7Y8OE= github.com/banzaicloud/k8s-objectmatcher v1.7.0 h1:6ufo47TaPC0jXJPg8d8/oooCy1ma3vEfM0J8ZbomKaw= github.com/banzaicloud/k8s-objectmatcher v1.7.0/go.mod h1:DSctpi6o9FqTfX7RluuEBeRLUahoDC7JavCeuu6Y+sg= @@ -1219,16 +1219,13 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w= github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/gjson v1.13.0 h1:3TFY9yxOQShrvmjdM76K+jc66zJeT6D3/VFFYCGQf7M= github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= From 5bf064e62ef09b6f1709a728302b3395f2dae2df Mon Sep 17 00:00:00 2001 From: Balint Molnar Date: Fri, 28 Jan 2022 15:20:28 +0100 Subject: [PATCH 2/3] Allow to set rc.x to helm chart versions (#758) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36b0cbd60b..138ac64832 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,4 +73,4 @@ workflows: branches: ignore: /.*/ tags: - only: /chart\/kafka-operator\/\d+.\d+.\d+/ + only: /chart\/kafka-operator\/\d+.\d+.\d+(-rc\.\d+)?/ From 4e7fc52a55b59221442ec251a4ab4fc5504ef4d8 Mon Sep 17 00:00:00 2001 From: Balint Molnar Date: Fri, 28 Jan 2022 15:43:28 +0100 Subject: [PATCH 3/3] Prepare release v0.21.0-rc.2 (#759) --- charts/kafka-operator/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kafka-operator/Chart.yaml b/charts/kafka-operator/Chart.yaml index 3daacd3dc0..c47c612344 100644 --- a/charts/kafka-operator/Chart.yaml +++ b/charts/kafka-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: kafka-operator -version: 0.21.0-rc.1 +version: 0.21.0-rc.2 description: kafka-operator manages Kafka deployments on Kubernetes sources: - https://github.com/banzaicloud/koperator -appVersion: v0.21.0-rc.1 +appVersion: v0.21.0-rc.2