From 9b5a06c1ffe2503a0d44d4c98d9d03b51460df3d Mon Sep 17 00:00:00 2001 From: wanjunlei Date: Thu, 15 Apr 2021 11:34:57 +0800 Subject: [PATCH] update kube-rbac-proxy to v0.8.0 Signed-off-by: wanjunlei --- config/bundle.yaml | 4 ++-- config/crd/bases/notification.kubesphere.io_configs.yaml | 2 +- config/default/manager_auth_proxy_patch.yaml | 2 +- helm/crds/notification.kubesphere.io_configs.yaml | 2 +- helm/values.yaml | 2 +- pkg/apis/v2beta1/config_types.go | 4 ++-- pkg/apis/v2beta1/notificationmanager_types.go | 2 +- pkg/apis/v2beta1/receiver_types.go | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/bundle.yaml b/config/bundle.yaml index 52759496..be11918c 100644 --- a/config/bundle.yaml +++ b/config/bundle.yaml @@ -20,7 +20,7 @@ spec: - name: v2beta1 schema: openAPIV3Schema: - description: DingTalkConfig is the Schema for the dingtalkconfigs API + description: Config is the Schema for the dingtalkconfigs API properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' @@ -2604,7 +2604,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=10 - image: kubesphere/kube-rbac-proxy:v0.4.1 + image: kubesphere/kube-rbac-proxy:v0.8.0 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/config/crd/bases/notification.kubesphere.io_configs.yaml b/config/crd/bases/notification.kubesphere.io_configs.yaml index ffbfd6b7..d68bcd9f 100644 --- a/config/crd/bases/notification.kubesphere.io_configs.yaml +++ b/config/crd/bases/notification.kubesphere.io_configs.yaml @@ -23,7 +23,7 @@ spec: - name: v2beta1 schema: openAPIV3Schema: - description: DingTalkConfig is the Schema for the dingtalkconfigs API + description: Config is the Schema for the dingtalkconfigs API properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index fb2b6f47..7aec6562 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: kubesphere/kube-rbac-proxy:v0.4.1 + image: kubesphere/kube-rbac-proxy:v0.8.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/helm/crds/notification.kubesphere.io_configs.yaml b/helm/crds/notification.kubesphere.io_configs.yaml index ffbfd6b7..d68bcd9f 100644 --- a/helm/crds/notification.kubesphere.io_configs.yaml +++ b/helm/crds/notification.kubesphere.io_configs.yaml @@ -23,7 +23,7 @@ spec: - name: v2beta1 schema: openAPIV3Schema: - description: DingTalkConfig is the Schema for the dingtalkconfigs API + description: Config is the Schema for the dingtalkconfigs API properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation diff --git a/helm/values.yaml b/helm/values.yaml index 33b1b885..7cac4771 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ operator: proxy: image: repo: kubesphere/kube-rbac-proxy - tag: v0.4.1 + tag: v0.8.0 pullPolicy: IfNotPresent resources: limits: diff --git a/pkg/apis/v2beta1/config_types.go b/pkg/apis/v2beta1/config_types.go index 10708d5d..a8706b3e 100644 --- a/pkg/apis/v2beta1/config_types.go +++ b/pkg/apis/v2beta1/config_types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// Configuration of conversation +// DingTalkApplicationConfig is the configuration of conversation type DingTalkApplicationConfig struct { // The key of the application with which to send messages. AppKey *SecretKeySelector `json:"appkey,omitempty"` @@ -137,7 +137,7 @@ type ConfigStatus struct { // +kubebuilder:resource:scope=Cluster,shortName=nc,categories=notification-manager // +kubebuilder:subresource:status -// DingTalkConfig is the Schema for the dingtalkconfigs API +// Config is the Schema for the dingtalkconfigs API type Config struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/pkg/apis/v2beta1/notificationmanager_types.go b/pkg/apis/v2beta1/notificationmanager_types.go index da653ed1..9cf20aaa 100644 --- a/pkg/apis/v2beta1/notificationmanager_types.go +++ b/pkg/apis/v2beta1/notificationmanager_types.go @@ -145,7 +145,7 @@ type WebhookOptions struct { Template string `json:"template,omitempty"` } -// The config of flow control. +// Throttle is the config of flow control. type Throttle struct { // The maximum calls in `Unit`. Threshold int `json:"threshold,omitempty"` diff --git a/pkg/apis/v2beta1/receiver_types.go b/pkg/apis/v2beta1/receiver_types.go index d817fa8d..af405d1d 100644 --- a/pkg/apis/v2beta1/receiver_types.go +++ b/pkg/apis/v2beta1/receiver_types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// Configuration of ChatBot +// DingTalkChatBot is the configuration of ChatBot type DingTalkChatBot struct { // The webhook of ChatBot which the message will send to. Webhook *SecretKeySelector `json:"webhook"` @@ -32,7 +32,7 @@ type DingTalkChatBot struct { Secret *SecretKeySelector `json:"secret,omitempty"` } -// Configuration of conversation +// DingTalkConversation is the configuration of conversation type DingTalkConversation struct { ChatIDs []string `json:"chatids"` }