diff --git a/Makefile b/Makefile index 9b345e1..7a09ddb 100644 --- a/Makefile +++ b/Makefile @@ -260,7 +260,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla .PHONY: podman-cross-build podman-cross-build: test - podman manifest create ${IMG} + podman manifest create -a ${IMG} podman build --platform $(PLATFORMS) --manifest ${IMG} -f Dockerfile.dev podman manifest push ${IMG} diff --git a/api/v1alpha1/perses_types.go b/api/v1alpha1/perses_types.go index 55db578..9b7fd05 100644 --- a/api/v1alpha1/perses_types.go +++ b/api/v1alpha1/perses_types.go @@ -213,6 +213,7 @@ type PersesStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:shortName=per +//+kubebuilder:deprecatedversion:warning="perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2" // Perses is the Schema for the perses API type Perses struct { diff --git a/api/v1alpha1/persesdashboard_types.go b/api/v1alpha1/persesdashboard_types.go index 365482a..beb9c85 100644 --- a/api/v1alpha1/persesdashboard_types.go +++ b/api/v1alpha1/persesdashboard_types.go @@ -29,6 +29,7 @@ type PersesDashboardStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:shortName=perdb +//+kubebuilder:deprecatedversion:warning="perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2" // PersesDashboard is the Schema for the persesdashboards API type PersesDashboard struct { diff --git a/api/v1alpha1/persesdatasource_types.go b/api/v1alpha1/persesdatasource_types.go index ec4870c..ed35fda 100644 --- a/api/v1alpha1/persesdatasource_types.go +++ b/api/v1alpha1/persesdatasource_types.go @@ -34,9 +34,10 @@ type DatasourceSpec struct { Client *Client `json:"client,omitempty"` } -// +kubebuilder:object:root=true -// +kubebuilder:subresource:status -// +kubebuilder:resource:shortName=perds +//+kubebuilder:object:root=true +//+kubebuilder:subresource:status +//+kubebuilder:resource:shortName=perds +//+kubebuilder:deprecatedversion:warning="perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2" // PersesDatasource is the Schema for the PersesDatasources API type PersesDatasource struct { diff --git a/config/crd/bases/perses.dev_perses.yaml b/config/crd/bases/perses.dev_perses.yaml index f6878f5..68929b4 100644 --- a/config/crd/bases/perses.dev_perses.yaml +++ b/config/crd/bases/perses.dev_perses.yaml @@ -16,7 +16,9 @@ spec: singular: perses scope: Namespaced versions: - - name: v1alpha1 + - deprecated: true + deprecationWarning: perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2 + name: v1alpha1 schema: openAPIV3Schema: description: Perses is the Schema for the perses API diff --git a/config/crd/bases/perses.dev_persesdashboards.yaml b/config/crd/bases/perses.dev_persesdashboards.yaml index d7cf5d3..d80708b 100644 --- a/config/crd/bases/perses.dev_persesdashboards.yaml +++ b/config/crd/bases/perses.dev_persesdashboards.yaml @@ -16,7 +16,9 @@ spec: singular: persesdashboard scope: Namespaced versions: - - name: v1alpha1 + - deprecated: true + deprecationWarning: perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2 + name: v1alpha1 schema: openAPIV3Schema: description: PersesDashboard is the Schema for the persesdashboards API diff --git a/config/crd/bases/perses.dev_persesdatasources.yaml b/config/crd/bases/perses.dev_persesdatasources.yaml index 23dd05f..d956ce3 100644 --- a/config/crd/bases/perses.dev_persesdatasources.yaml +++ b/config/crd/bases/perses.dev_persesdatasources.yaml @@ -16,7 +16,9 @@ spec: singular: persesdatasource scope: Namespaced versions: - - name: v1alpha1 + - deprecated: true + deprecationWarning: perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2 + name: v1alpha1 schema: openAPIV3Schema: description: PersesDatasource is the Schema for the PersesDatasources API diff --git a/jsonnet/examples/0persesCustomResourceDefinition.yaml b/jsonnet/examples/0persesCustomResourceDefinition.yaml index 5cab248..3a83834 100644 --- a/jsonnet/examples/0persesCustomResourceDefinition.yaml +++ b/jsonnet/examples/0persesCustomResourceDefinition.yaml @@ -15,7 +15,9 @@ spec: singular: perses scope: Namespaced versions: - - name: v1alpha1 + - deprecated: true + deprecationWarning: perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2 + name: v1alpha1 schema: openAPIV3Schema: description: Perses is the Schema for the perses API diff --git a/jsonnet/examples/0persesdashboardsCustomResourceDefinition.yaml b/jsonnet/examples/0persesdashboardsCustomResourceDefinition.yaml index 5467ff7..f59366b 100644 --- a/jsonnet/examples/0persesdashboardsCustomResourceDefinition.yaml +++ b/jsonnet/examples/0persesdashboardsCustomResourceDefinition.yaml @@ -15,7 +15,9 @@ spec: singular: persesdashboard scope: Namespaced versions: - - name: v1alpha1 + - deprecated: true + deprecationWarning: perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2 + name: v1alpha1 schema: openAPIV3Schema: description: PersesDashboard is the Schema for the persesdashboards API diff --git a/jsonnet/examples/0persesdatasourcesCustomResourceDefinition.yaml b/jsonnet/examples/0persesdatasourcesCustomResourceDefinition.yaml index 52fa58d..733f52b 100644 --- a/jsonnet/examples/0persesdatasourcesCustomResourceDefinition.yaml +++ b/jsonnet/examples/0persesdatasourcesCustomResourceDefinition.yaml @@ -15,7 +15,9 @@ spec: singular: persesdatasource scope: Namespaced versions: - - name: v1alpha1 + - deprecated: true + deprecationWarning: perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2 + name: v1alpha1 schema: openAPIV3Schema: description: PersesDatasource is the Schema for the PersesDatasources API diff --git a/jsonnet/generated/perses.dev_perses-crd.json b/jsonnet/generated/perses.dev_perses-crd.json index 5938c48..e5007d3 100644 --- a/jsonnet/generated/perses.dev_perses-crd.json +++ b/jsonnet/generated/perses.dev_perses-crd.json @@ -21,6 +21,8 @@ "scope": "Namespaced", "versions": [ { + "deprecated": true, + "deprecationWarning": "perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2", "name": "v1alpha1", "schema": { "openAPIV3Schema": { diff --git a/jsonnet/generated/perses.dev_persesdashboards-crd.json b/jsonnet/generated/perses.dev_persesdashboards-crd.json index 47d61b3..25dc619 100644 --- a/jsonnet/generated/perses.dev_persesdashboards-crd.json +++ b/jsonnet/generated/perses.dev_persesdashboards-crd.json @@ -21,6 +21,8 @@ "scope": "Namespaced", "versions": [ { + "deprecated": true, + "deprecationWarning": "perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2", "name": "v1alpha1", "schema": { "openAPIV3Schema": { diff --git a/jsonnet/generated/perses.dev_persesdatasources-crd.json b/jsonnet/generated/perses.dev_persesdatasources-crd.json index 353ff49..d655fcb 100644 --- a/jsonnet/generated/perses.dev_persesdatasources-crd.json +++ b/jsonnet/generated/perses.dev_persesdatasources-crd.json @@ -21,6 +21,8 @@ "scope": "Namespaced", "versions": [ { + "deprecated": true, + "deprecationWarning": "perses.dev/v1alpha1 is deprecated; use perses.dev/v1alpha2", "name": "v1alpha1", "schema": { "openAPIV3Schema": {