fix:修复javaagent注入配置存在问题

Makefile

@@ -3,7 +3,7 @@ ORG = polarismesh
 REPO = polaris-controller
 SIDECAR_INIT_REPO = polaris-sidecar-init
 ENVOY_SIDECAR_INIT_REPO = polaris-envoy-bootstrap-generator
-IMAGE_TAG = v1.7.0-alpha.3
+IMAGE_TAG = v1.7.1
 PLATFORMS = linux/amd64,linux/arm64
 
 .PHONY: all

cmd/polaris-controller/app/polaris-controller-manager.go

@@ -577,6 +577,8 @@ func registerController(c *options.KubeControllerManagerConfiguration, provider
 	req.Host = podIP
 	req.Port = int(c.Generic.Port)
 	req.SetTTL(5)
+	// 开启自动上报心跳
+	req.AutoHeartbeat = true
 
 	_, err := provider.RegisterInstance(req)
 	if err != nil {

pkg/inject/pkg/kube/inject/inject.go

@@ -613,11 +613,11 @@ func parseTemplate(tmplStr string, funcMap map[string]interface{}, data SidecarT
 	temp := template.New("inject")
 	t, err := temp.Funcs(funcMap).Parse(tmplStr)
 	if err != nil {
-		log.InjectScope().Infof("Failed to parse template: %v %v\n", err, tmplStr)
+		log.InjectScope().Errorf("Failed to parse template: %v %v\n", err, tmplStr)
 		return bytes.Buffer{}, err
 	}
 	if err := t.Execute(&tmpl, &data); err != nil {
-		log.InjectScope().Infof("Invalid template: %v %v\n", err, tmplStr)
+		log.InjectScope().Errorf("Invalid template: %v %v\n", err, tmplStr)
 		return bytes.Buffer{}, err
 	}
 

pkg/inject/pkg/kube/inject/webhook.go

@@ -340,6 +340,7 @@ func (wh *Webhook) Run(stop <-chan struct{}) {
 
 			sidecarMeshConfig := injectConf.MeshInjectConf
 			sidecarDnsConfig := injectConf.DnsInjectConf
+			sidecarJavaagentConfig := injectConf.JavaAgentInjectConf
 			meshConfig := injectConf.MeshConf
 			valuesConfig := injectConf.ValuesConf
 
@@ -348,8 +349,8 @@ func (wh *Webhook) Run(stop <-chan struct{}) {
 			wh.sidecarMeshTemplateVersion = sidecarTemplateVersionHash(sidecarMeshConfig.Template)
 			wh.sidecarDnsConfig = sidecarDnsConfig
 			wh.sidecarDnsTemplateVersion = sidecarTemplateVersionHash(sidecarDnsConfig.Template)
-			wh.sidecarJavaAgentConfig = sidecarDnsConfig
-			wh.sidecarJavaAgentTemplateVersion = sidecarTemplateVersionHash(sidecarDnsConfig.Template)
+			wh.sidecarJavaAgentConfig = sidecarJavaagentConfig
+			wh.sidecarJavaAgentTemplateVersion = sidecarTemplateVersionHash(sidecarJavaagentConfig.Template)
 
 			wh.valuesConfig = valuesConfig
 			wh.meshConfig = meshConfig

sidecar/polaris-sidecar-init/Dockerfile

@@ -13,7 +13,7 @@
 #  CONDITIONS OF ANY KIND, either express or implied. See the License for the
 #  specific language governing permissions and limitations under the License.
 
-FROM alpine:latest
+FROM alpine:3.18.6
 
 # Copy Startup Script
 COPY start.sh /start.sh