Skip to content

Commit

Permalink
Merge pull request #697 from gianlucam76/release-0.38
Browse files Browse the repository at this point in the history 
Release 0.38
  • Loading branch information
@gianlucam76
gianlucam76 committed Sep 19, 2024
2 parents 47e2028 + 6481e96 commit 94e720f
Show file tree
Hide file tree
Showing 22 changed files with 595 additions and 376 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ARCH ?= $(shell go env GOARCH)
OS ?= $(shell uname -s | tr A-Z a-z)
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= v0.38.1
TAG ?= v0.38.2

.PHONY: all
all: build
Expand Down
3 changes: 1 addition & 2 deletions api/v1alpha1/zz_generated.conversion.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 21 additions & 9 deletions api/v1beta1/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,32 @@ type ValueFrom struct {
Kind string `json:"kind"`
}

// TLSConfig represents the TLS configuration.
type TLSConfig struct {
type RegistryCredentialsConfig struct {
// CredentialsSecretRef references a secret containing credentials
// For ClusterProfile namespace can be left empty. In such a case, namespace will
// be implicit set to cluster's namespace.
// +optional
CredentialsSecretRef *corev1.SecretReference `json:"credentials,omitempty"`

// Key specifies the key within the CredentialsSecretRef containing the data
// If not specified, it defaults to the only key in the secret if there's just one.
// +optional
Key string `json:"key,omitempty"`

// CASecretRef references a secret containing the TLS CA certificate
// For ClusterProfile namespace can be left empty. In such a case, namespace will
// be implicit set to cluster's namespace.
// key: ca.crt
// +optional
CASecretRef *corev1.SecretReference `json:"ca,omitempty"`

// InsecureSkipTLSVerify controls server certificate verification.
// +optional
InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty"`

// PlainHTTP indicates to use insecure HTTP connections for the chart download
// +optional
PlainHTTP bool `json:"plainHTTP,omitempty"`
}

// HelmChartAction specifies action on an helm chart
Expand Down Expand Up @@ -363,14 +379,10 @@ type HelmChart struct {
// +optional
Options *HelmOptions `json:"options,omitempty"`

// CredentialsSecretRef references a secret containing credentials
// key: config.json
// +optional
CredentialsSecretRef *corev1.SecretReference `json:"credentials,omitempty"`

// TLSConfig represents the TLS configuration for private registries.
// RegistryCredentialsConfig is an optional configuration for credentials,
// including information to connect to private registries.
// +optional
TLSConfig *TLSConfig `json:"tlsConfig,omitempty"`
RegistryCredentialsConfig *RegistryCredentialsConfig `json:"registryCredentialsConfig,omitempty"`
}

type KustomizationRef struct {
Expand Down
56 changes: 28 additions & 28 deletions api/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 48 additions & 35 deletions config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,21 +1159,6 @@ spec:
description: ChartVersion is the chart version
minLength: 1
type: string
credentials:
description: |-
CredentialsSecretRef references a secret containing credentials
key: config.json
properties:
name:
description: name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: namespace defines the space within which the
secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
helmChartAction:
default: Install
description: HelmChartAction is the action that will be taken
Expand Down Expand Up @@ -1336,30 +1321,16 @@ spec:
Default to false
type: boolean
type: object
releaseName:
description: ReleaseName is the chart release
minLength: 1
type: string
releaseNamespace:
description: ReleaseNamespace is the namespace release will
be installed
minLength: 1
type: string
repositoryName:
description: RepositoryName is the name helm chart repository
minLength: 1
type: string
repositoryURL:
description: RepositoryURL is the URL helm chart repository
minLength: 1
type: string
tlsConfig:
description: TLSConfig represents the TLS configuration for
private registries.
registryCredentialsConfig:
description: |-
RegistryCredentialsConfig is an optional configuration for credentials,
including information to connect to private registries.
properties:
ca:
description: |-
CASecretRef references a secret containing the TLS CA certificate
For ClusterProfile namespace can be left empty. In such a case, namespace will
be implicit set to cluster's namespace.
key: ca.crt
properties:
name:
Expand All @@ -1372,11 +1343,53 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
credentials:
description: |-
CredentialsSecretRef references a secret containing credentials
For ClusterProfile namespace can be left empty. In such a case, namespace will
be implicit set to cluster's namespace.
properties:
name:
description: name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: namespace defines the space within which
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
insecureSkipTLSVerify:
description: InsecureSkipTLSVerify controls server certificate
verification.
type: boolean
key:
description: |-
Key specifies the key within the CredentialsSecretRef containing the data
If not specified, it defaults to the only key in the secret if there's just one.
type: string
plainHTTP:
description: PlainHTTP indicates to use insecure HTTP connections
for the chart download
type: boolean
type: object
releaseName:
description: ReleaseName is the chart release
minLength: 1
type: string
releaseNamespace:
description: ReleaseNamespace is the namespace release will
be installed
minLength: 1
type: string
repositoryName:
description: RepositoryName is the name helm chart repository
minLength: 1
type: string
repositoryURL:
description: RepositoryURL is the URL helm chart repository
minLength: 1
type: string
values:
description: |-
Values field allows to define configuration for the Helm release.
Expand Down
83 changes: 48 additions & 35 deletions config/crd/bases/config.projectsveltos.io_clustersummaries.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1181,21 +1181,6 @@ spec:
description: ChartVersion is the chart version
minLength: 1
type: string
credentials:
description: |-
CredentialsSecretRef references a secret containing credentials
key: config.json
properties:
name:
description: name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: namespace defines the space within which
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
helmChartAction:
default: Install
description: HelmChartAction is the action that will be
Expand Down Expand Up @@ -1360,30 +1345,16 @@ spec:
Default to false
type: boolean
type: object
releaseName:
description: ReleaseName is the chart release
minLength: 1
type: string
releaseNamespace:
description: ReleaseNamespace is the namespace release will
be installed
minLength: 1
type: string
repositoryName:
description: RepositoryName is the name helm chart repository
minLength: 1
type: string
repositoryURL:
description: RepositoryURL is the URL helm chart repository
minLength: 1
type: string
tlsConfig:
description: TLSConfig represents the TLS configuration
for private registries.
registryCredentialsConfig:
description: |-
RegistryCredentialsConfig is an optional configuration for credentials,
including information to connect to private registries.
properties:
ca:
description: |-
CASecretRef references a secret containing the TLS CA certificate
For ClusterProfile namespace can be left empty. In such a case, namespace will
be implicit set to cluster's namespace.
key: ca.crt
properties:
name:
Expand All @@ -1396,11 +1367,53 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
credentials:
description: |-
CredentialsSecretRef references a secret containing credentials
For ClusterProfile namespace can be left empty. In such a case, namespace will
be implicit set to cluster's namespace.
properties:
name:
description: name is unique within a namespace to
reference a secret resource.
type: string
namespace:
description: namespace defines the space within
which the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
insecureSkipTLSVerify:
description: InsecureSkipTLSVerify controls server certificate
verification.
type: boolean
key:
description: |-
Key specifies the key within the CredentialsSecretRef containing the data
If not specified, it defaults to the only key in the secret if there's just one.
type: string
plainHTTP:
description: PlainHTTP indicates to use insecure HTTP
connections for the chart download
type: boolean
type: object
releaseName:
description: ReleaseName is the chart release
minLength: 1
type: string
releaseNamespace:
description: ReleaseNamespace is the namespace release will
be installed
minLength: 1
type: string
repositoryName:
description: RepositoryName is the name helm chart repository
minLength: 1
type: string
repositoryURL:
description: RepositoryURL is the URL helm chart repository
minLength: 1
type: string
values:
description: |-
Values field allows to define configuration for the Helm release.
Expand Down
Loading

0 comments on commit 94e720f

Please sign in to comment.