From 2ddb7772d1b42891e2dfcd18a99d4c591cbacfb1 Mon Sep 17 00:00:00 2001 From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Date: Fri, 13 Jan 2023 13:34:03 -0500 Subject: [PATCH] fix: pathParamPrefix is optional (#11796) (#11943) * fix: pathParamPrefix is optional Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * go mod tidy Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix import Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix codegen Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --- manifests/core-install.yaml | 3 --- manifests/crds/applicationset-crd.yaml | 3 --- manifests/ha/install.yaml | 3 --- manifests/install.yaml | 3 --- pkg/apis/application/v1alpha1/applicationset_types.go | 2 +- pkg/apis/application/v1alpha1/openapi_generated.go | 7 +++---- 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml index fb10e32bf347b..304e5b2a0f06e 100644 --- a/manifests/core-install.yaml +++ b/manifests/core-install.yaml @@ -5476,7 +5476,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -7367,7 +7366,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -10916,7 +10914,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object diff --git a/manifests/crds/applicationset-crd.yaml b/manifests/crds/applicationset-crd.yaml index ab2b6d43ef081..7f8c3e0251972 100644 --- a/manifests/crds/applicationset-crd.yaml +++ b/manifests/crds/applicationset-crd.yaml @@ -1462,7 +1462,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -3353,7 +3352,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -6902,7 +6900,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 063ff63705b49..62461d59ffa66 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -5476,7 +5476,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -7367,7 +7366,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -10916,7 +10914,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object diff --git a/manifests/install.yaml b/manifests/install.yaml index 50d4cde417c09..ce867269fafaa 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -5476,7 +5476,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -7367,7 +7366,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object @@ -10916,7 +10914,6 @@ spec: - spec type: object required: - - pathParamPrefix - repoURL - revision type: object diff --git a/pkg/apis/application/v1alpha1/applicationset_types.go b/pkg/apis/application/v1alpha1/applicationset_types.go index 3ba2e51ede047..56b1bcfad98be 100644 --- a/pkg/apis/application/v1alpha1/applicationset_types.go +++ b/pkg/apis/application/v1alpha1/applicationset_types.go @@ -313,7 +313,7 @@ type GitGenerator struct { Revision string `json:"revision" protobuf:"bytes,4,name=revision"` RequeueAfterSeconds *int64 `json:"requeueAfterSeconds,omitempty" protobuf:"bytes,5,name=requeueAfterSeconds"` Template ApplicationSetTemplate `json:"template,omitempty" protobuf:"bytes,6,name=template"` - PathParamPrefix string `json:"pathParamPrefix" protobuf:"bytes,7,name=pathParamPrefix"` + PathParamPrefix string `json:"pathParamPrefix,omitempty" protobuf:"bytes,7,name=pathParamPrefix"` } type GitDirectoryGeneratorItem struct { diff --git a/pkg/apis/application/v1alpha1/openapi_generated.go b/pkg/apis/application/v1alpha1/openapi_generated.go index 5452b75aa2f6e..17fbea6cf9e11 100644 --- a/pkg/apis/application/v1alpha1/openapi_generated.go +++ b/pkg/apis/application/v1alpha1/openapi_generated.go @@ -3066,13 +3066,12 @@ func schema_pkg_apis_application_v1alpha1_GitGenerator(ref common.ReferenceCallb }, "pathParamPrefix": { SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", + Type: []string{"string"}, + Format: "", }, }, }, - Required: []string{"repoURL", "revision", "pathParamPrefix"}, + Required: []string{"repoURL", "revision"}, }, }, Dependencies: []string{