Merge "Set time zone"

diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec
index 57556a7..97ca95d 100644 (file)
--- a/SPECS/caas-chartrepo.spec
+++ b/SPECS/caas-chartrepo.spec
@@ -15,7 +15,7 @@
 %define COMPONENT chartrepo
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save

diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index 87d69d3..ed06184 100644 (file)
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -15,7 +15,7 @@
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.13.1
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define go_version 1.11.5
 %define cni_plugins_version 0.7.0

diff --git a/src/chart-repo-handler/main.go b/src/chart-repo-handler/main.go
index 5cf35b4..cce3cf0 100644 (file)
--- a/src/chart-repo-handler/main.go
+++ b/src/chart-repo-handler/main.go
@@ -139,8 +139,6 @@ func startHttpServer(envConfig config.EnvConfig, swiftConn *swift.Connection) {
         tls.TLS_RSA_WITH_AES_256_CBC_SHA,
       },
     }
-  } else {
-    tlsCfg = &tls.Config{}
   }
   chartRepo = &http.Server{
     Addr:         envConfig.ListenOnIP + ":" + envConfig.ListenOnPort,