Merge branch 'main' into feat/codify-custom-search-attributes

alexandrevilain · Oct 1, 2024 · 0a188b7 · 0a188b7
2 parents 8452659 + 85befcb
commit 0a188b7
Show file tree

Hide file tree

Showing 62 changed files with 1,207 additions and 955 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -11,7 +11,7 @@ defaults:
     shell: bash
 
 env:
-  GOLANG_CI_VERSION: v1.59.1
+  GOLANG_CI_VERSION: v1.61.0
 
 jobs:
   license:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -16,7 +16,7 @@ linters:
   - durationcheck
   - errcheck
   - errchkjson
-  - exportloopref
+  - copyloopvar
   - ginkgolinter
   - goconst
   - gocritic

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM} golang:1.22.2 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.23.1 AS builder
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM

diff --git a/Makefile b/Makefile
@@ -207,11 +207,11 @@ HELM_DOCS ?= $(LOCALBIN)/helm-docs
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v4.5.7
-OPERATOR_SDK_VERSION ?= 1.30.0
-CONTROLLER_TOOLS_VERSION ?=  v0.15.0
+OPERATOR_SDK_VERSION ?= 1.37.0
+CONTROLLER_TOOLS_VERSION ?=  v0.16.3
 GO_LICENSER_VERSION ?= v0.4.0
 GEN_CRD_API_REFERENCE_DOCS_VERSION ?= 3f29e6853552dcf08a8e846b1225f275ed0f3e3b
-GOLANGCI_LINT_VERSION ?= v1.59.1
+GOLANGCI_LINT_VERSION ?= v1.61.0
 YQ_VERSION ?= v4.30.6
 KIND_WITH_REGISTRY_VERSION ?= 0.17.0
 HELM_DOCS_VERSION ?= v1.12.0

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ metadata:
   name: prod
   namespace: demo
 spec:
-  version: 1.23.0
+  version: 1.24.2
   numHistoryShards: 1
   persistence:
     defaultStore:
@@ -62,18 +62,20 @@ Somes examples are available to help you get started:
 The following table shows operator compatibility with Temporal and Kubernetes.
 Please note this table only reports end-to-end tests suite coverage, others versions *may* work.
 
-| Temporal Operator | Temporal           | Kubernetes     |
-|-------------------|--------------------|----------------|
-| v0.18.x           | v1.19.x to v1.23.x | v1.25 to v1.29 |
-| v0.17.x           | v1.18.x to v1.22.x | v1.25 to v1.29 |
-| v0.16.x           | v1.18.x to v1.22.x | v1.24 to v1.27 |
-| v0.15.x           | v1.18.x to v1.21.x | v1.24 to v1.27 |
-| v0.14.x           | v1.18.x to v1.21.x | v1.24 to v1.27 |
-| v0.13.x           | v1.18.x to v1.20.x | v1.24 to v1.27 |
-| v0.12.x           | v1.18.x to v1.20.x | v1.23 to v1.26 |
-| v0.11.x           | v1.17.x to v1.19.x | v1.23 to v1.26 |
-| v0.10.x           | v1.17.x to v1.19.x | v1.23 to v1.26 |
-| v0.9.x            | v1.16.x to v1.18.x | v1.22 to v1.25 |
+| Temporal Operator      | Temporal           | Kubernetes     |
+|------------------------|--------------------|----------------|
+| v0.20.x                | v1.19.x to v1.24.x | v1.26 to v1.30 |
+| v0.19.x                | v1.19.x to v1.23.x | v1.25 to v1.29 |
+| v0.18.x                | v1.19.x to v1.23.x | v1.25 to v1.29 |
+| v0.17.x                | v1.18.x to v1.22.x | v1.25 to v1.29 |
+| v0.16.x                | v1.18.x to v1.22.x | v1.24 to v1.27 |
+| v0.15.x                | v1.18.x to v1.21.x | v1.24 to v1.27 |
+| v0.14.x                | v1.18.x to v1.21.x | v1.24 to v1.27 |
+| v0.13.x                | v1.18.x to v1.20.x | v1.24 to v1.27 |
+| v0.12.x                | v1.18.x to v1.20.x | v1.23 to v1.26 |
+| v0.11.x                | v1.17.x to v1.19.x | v1.23 to v1.26 |
+| v0.10.x                | v1.17.x to v1.19.x | v1.23 to v1.26 |
+| v0.9.x                 | v1.16.x to v1.18.x | v1.22 to v1.25 |
 
 ## Roadmap
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.19.0
+0.20.0
diff --git a/api/v1beta1/temporalcluster_defaults.go b/api/v1beta1/temporalcluster_defaults.go
@@ -26,10 +26,10 @@ import (
 )
 
 const (
-	defaultTemporalVersion = "1.23.0"
+	defaultTemporalVersion = "1.24.2"
 	defaultTemporalImage   = "temporalio/server"
 
-	defaultTemporalUIVersion = "2.25.0"
+	defaultTemporalUIVersion = "2.27.3"
 	defaultTemporalUIImage   = "temporalio/ui"
 
 	defaultTemporalAdmintoolsImage = "temporalio/admin-tools"
@@ -89,27 +89,27 @@ func (c *TemporalCluster) Default() {
 		c.Spec.Services.Frontend.Replicas = ptr.To[int32](1)
 	}
 	if c.Spec.Services.Frontend.Port == nil {
-		c.Spec.Services.Frontend.Port = ptr.To(7233)
+		c.Spec.Services.Frontend.Port = ptr.To[int32](7233)
 	}
 	if c.Spec.Services.Frontend.MembershipPort == nil {
-		c.Spec.Services.Frontend.MembershipPort = ptr.To(6933)
+		c.Spec.Services.Frontend.MembershipPort = ptr.To[int32](6933)
 	}
 	if c.Spec.Services.Frontend.HTTPPort == nil {
-		c.Spec.Services.Frontend.HTTPPort = ptr.To(7243)
+		c.Spec.Services.Frontend.HTTPPort = ptr.To[int32](7243)
 	}
 	// Internal Frontend specs
 	if c.Spec.Services.InternalFrontend.IsEnabled() {
 		if c.Spec.Services.InternalFrontend.Replicas == nil {
 			c.Spec.Services.InternalFrontend.Replicas = ptr.To[int32](1)
 		}
 		if c.Spec.Services.InternalFrontend.Port == nil {
-			c.Spec.Services.InternalFrontend.Port = ptr.To(7236)
+			c.Spec.Services.InternalFrontend.Port = ptr.To[int32](7236)
 		}
 		if c.Spec.Services.InternalFrontend.MembershipPort == nil {
-			c.Spec.Services.InternalFrontend.MembershipPort = ptr.To(6936)
+			c.Spec.Services.InternalFrontend.MembershipPort = ptr.To[int32](6936)
 		}
 		if c.Spec.Services.InternalFrontend.HTTPPort == nil {
-			c.Spec.Services.InternalFrontend.HTTPPort = ptr.To(0)
+			c.Spec.Services.InternalFrontend.HTTPPort = ptr.To[int32](0)
 		}
 	}
 	// History specs
@@ -120,13 +120,13 @@ func (c *TemporalCluster) Default() {
 		c.Spec.Services.History.Replicas = ptr.To[int32](1)
 	}
 	if c.Spec.Services.History.Port == nil {
-		c.Spec.Services.History.Port = ptr.To(7234)
+		c.Spec.Services.History.Port = ptr.To[int32](7234)
 	}
 	if c.Spec.Services.History.MembershipPort == nil {
-		c.Spec.Services.History.MembershipPort = ptr.To(6934)
+		c.Spec.Services.History.MembershipPort = ptr.To[int32](6934)
 	}
 	if c.Spec.Services.History.HTTPPort == nil {
-		c.Spec.Services.History.HTTPPort = ptr.To(0)
+		c.Spec.Services.History.HTTPPort = ptr.To[int32](0)
 	}
 	// Matching specs
 	if c.Spec.Services.Matching == nil {
@@ -136,13 +136,13 @@ func (c *TemporalCluster) Default() {
 		c.Spec.Services.Matching.Replicas = ptr.To[int32](1)
 	}
 	if c.Spec.Services.Matching.Port == nil {
-		c.Spec.Services.Matching.Port = ptr.To(7235)
+		c.Spec.Services.Matching.Port = ptr.To[int32](7235)
 	}
 	if c.Spec.Services.Matching.MembershipPort == nil {
-		c.Spec.Services.Matching.MembershipPort = ptr.To(6935)
+		c.Spec.Services.Matching.MembershipPort = ptr.To[int32](6935)
 	}
 	if c.Spec.Services.Matching.HTTPPort == nil {
-		c.Spec.Services.Matching.HTTPPort = ptr.To(0)
+		c.Spec.Services.Matching.HTTPPort = ptr.To[int32](0)
 	}
 	// Worker specs
 	if c.Spec.Services.Worker == nil {
@@ -152,13 +152,13 @@ func (c *TemporalCluster) Default() {
 		c.Spec.Services.Worker.Replicas = ptr.To[int32](1)
 	}
 	if c.Spec.Services.Worker.Port == nil {
-		c.Spec.Services.Worker.Port = ptr.To(7239)
+		c.Spec.Services.Worker.Port = ptr.To[int32](7239)
 	}
 	if c.Spec.Services.Worker.MembershipPort == nil {
-		c.Spec.Services.Worker.MembershipPort = ptr.To(6939)
+		c.Spec.Services.Worker.MembershipPort = ptr.To[int32](6939)
 	}
 	if c.Spec.Services.Worker.HTTPPort == nil {
-		c.Spec.Services.Worker.HTTPPort = ptr.To(0)
+		c.Spec.Services.Worker.HTTPPort = ptr.To[int32](0)
 	}
 
 	if c.Spec.Persistence.DefaultStore != nil {

diff --git a/api/v1beta1/temporalcluster_types.go b/api/v1beta1/temporalcluster_types.go
@@ -71,20 +71,20 @@ type ServiceSpec struct {
 	// 7235 for Matching service
 	// 7239 for Worker service
 	// +optional
-	Port *int `json:"port"`
+	Port *int32 `json:"port"`
 	// MembershipPort defines a custom membership port for the service.
 	// Default values are:
 	// 6933 for Frontend service
 	// 6934 for History service
 	// 6935 for Matching service
 	// 6939 for Worker service
 	// +optional
-	MembershipPort *int `json:"membershipPort"`
+	MembershipPort *int32 `json:"membershipPort"`
 	// HTTPPort defines a custom http port for the service.
 	// Default values are:
 	// 7243 for Frontend service
 	// +optional
-	HTTPPort *int `json:"httpPort"`
+	HTTPPort *int32 `json:"httpPort"`
 	// Number of desired replicas for the service. Default to 1.
 	// +kubebuilder:validation:Minimum=1
 	// +optional
@@ -585,6 +585,9 @@ type TemporalAdminToolsSpec struct {
 	// Image defines the temporal admin tools docker image the instance should run.
 	// +optional
 	Image string `json:"image"`
+	// Version defines the temporal admin tools version the instance should run.
+	// +optional
+	Version string `json:"version"`
 	// Compute Resources required by the ui.
 	// More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
 	// +optional
@@ -736,7 +739,7 @@ type PrometheusScrapeConfigServiceMonitor struct {
 	Override *monitoringv1.ServiceMonitorSpec `json:"override,omitempty"`
 	// MetricRelabelConfigs to apply to samples before ingestion.
 	// +optional
-	MetricRelabelConfigs []*monitoringv1.RelabelConfig `json:"metricRelabelings,omitempty"`
+	MetricRelabelConfigs []monitoringv1.RelabelConfig `json:"metricRelabelings,omitempty"`
 }
 
 // PrometheusScrapeConfig is the configuration for making prometheus scrape components metrics.

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go