Skip to content

Commit 2405156

Browse files
committed
Improve logging levels for config map creation and updates
1 parent b354263 commit 2405156

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/mutation/mutation_deploy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func injectionDeploy(request *admissionv1.AdmissionRequest) (*admissionv1.Admiss
5858
err := jsoniter.Unmarshal(request.Object.Raw, &deploy)
5959
if err != nil {
6060
errMsg := fmt.Sprintf("[mutation] /injection-deploy: failed to unmarshal object: %v", err)
61-
log.Error(errMsg)
61+
log.Errorf(errMsg)
6262
return &admissionv1.AdmissionResponse{
6363
Allowed: false,
6464
Result: &metav1.Status{
@@ -67,6 +67,7 @@ func injectionDeploy(request *admissionv1.AdmissionRequest) (*admissionv1.Admiss
6767
},
6868
}, nil
6969
}
70+
log.Infof("[mutation] /injection-deploy: create config map for this deployment: %s, namespace: %s", deploy.Name, deploy.Namespace)
7071
err = createConfigMap(&deploy)
7172
if err != nil {
7273
errMsg := fmt.Sprintf("[mutation] /injection-deploy: failed to create configmap: %v", err)
@@ -112,7 +113,6 @@ func createConfigMap(deploy *appsv1.Deployment) error {
112113
},
113114
Data: configMapData,
114115
}
115-
//logger.Debugf("create configmap: %v", configMap)
116116
err := rs.CreateOrUpdateConfigMap(context.Background(), deploy.Namespace, configMap)
117117
if err != nil {
118118
log.Errorf("create configmap %s in %s error: %v", deploy.Name, deploy.Namespace, err)

pkg/resource/resource.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ func GetResource() *Resource {
7373

7474
func (r *Resource) CreateOrUpdateConfigMap(ctx context.Context, namespace string, configMap *corev1.ConfigMap) error {
7575
cm, err := r.ClientSet.CoreV1().ConfigMaps(namespace).Get(ctx, configMap.Name, metav1.GetOptions{})
76-
if !errors2.IsNotFound(err) {
76+
if err != nil && !errors2.IsNotFound(err) {
7777
return err
7878
}
7979
if cm == nil || errors2.IsNotFound(err) {
8080
// create
81-
log.Info("create configMap", zap.String("name", configMap.Name), zap.String("namespace", namespace))
81+
log.Debug("create configMap", zap.String("name", configMap.Name), zap.String("namespace", namespace))
8282
_, err = r.ClientSet.CoreV1().ConfigMaps(namespace).Create(context.TODO(), configMap, metav1.CreateOptions{})
8383
if err != nil {
8484
return err
8585
}
8686
} else {
87-
log.Info("update configMap", zap.String("name", configMap.Name), zap.String("namespace", namespace), zap.Any("data", configMap.Data))
87+
log.Debug("update configMap", zap.String("name", configMap.Name), zap.String("namespace", namespace), zap.Any("data", configMap.Data))
8888
cm.Data = configMap.Data
8989
_, err = r.ClientSet.CoreV1().ConfigMaps(namespace).Update(context.TODO(), cm, metav1.UpdateOptions{})
9090
if err != nil {

0 commit comments

Comments
 (0)