Adapting changes to v1.15.3 codebase

gravitational · Sep 6, 2024 · 54e6eda · 54e6eda
1 parent cc70b87
commit 54e6eda
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -18,7 +18,7 @@ jobs:
           go-version-file: go.mod
           cache: true
       - name: Run tests
-        run: make test RELEASE_VERSION=0.0.0
+        run: make test VERSION=0.0.0
   build-and-push:
     name: Build and push Docker image
     runs-on: ubuntu-latest

diff --git a/internal/apis/config/controller/v1alpha1/defaults.go b/internal/apis/config/controller/v1alpha1/defaults.go
@@ -312,7 +312,7 @@ func SetDefaults_ACMEDNS01Config(obj *v1alpha1.ACMEDNS01Config) {
 		obj.CheckRetryPeriod = sharedv1alpha1.DurationFromTime(defaultDNS01CheckRetryPeriod)
 	}
 
-	if obj.PropagationTime == time.Duration(0) {
-		obj.PropagationTime = defaultDNS01PropagationTime
+	if obj.PropagationTime.IsZero() {
+		obj.PropagationTime = sharedv1alpha1.DurationFromTime(defaultDNS01PropagationTime)
 	}
 }
diff --git a/internal/apis/config/controller/v1alpha1/testdata/defaults.json b/internal/apis/config/controller/v1alpha1/testdata/defaults.json
@@ -65,6 +65,7 @@
 	},
 	"acmeDNS01Config": {
 		"recursiveNameserversOnly": false,
-		"checkRetryPeriod": "10s"
+		"checkRetryPeriod": "10s",
+		"propagationTime": "1m0s"
 	}
 }
diff --git a/internal/apis/config/controller/v1alpha1/zz_generated.conversion.go b/internal/apis/config/controller/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/config/controller/v1alpha1/types.go b/pkg/apis/config/controller/v1alpha1/types.go
@@ -17,8 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"time"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	logsapi "k8s.io/component-base/logs/api/v1"
 
@@ -225,5 +223,5 @@ type ACMEDNS01Config struct {
 
 	// The duration the controller should wait after determining that an ACME dns entry exists.
 	// This should be a valid duration string, for example 180s or 1h
-	PropagationTime time.Duration `json:"propagationTime,omitempty"`
+	PropagationTime *sharedv1alpha1.Duration `json:"propagationTime,omitempty"`
 }
diff --git a/pkg/apis/config/controller/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/controller/v1alpha1/zz_generated.deepcopy.go