Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/fv/auto_deploy_dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ var _ = Describe("Feature", func() {
RepositoryURL: kyvernoRepoURL,
RepositoryName: kyvernoNamespace,
ChartName: kyvernoChartName,
ChartVersion: kyvernoVersion372,
ChartVersion: kyvernoVersion391,
ReleaseName: kyvernoLatestRelease,
ReleaseNamespace: kyvernoNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -167,7 +167,7 @@ var _ = Describe("Feature", func() {
kindWorkloadCluster.GetNamespace(), kindWorkloadCluster.GetName(), getClusterType())

charts := []configv1beta1.Chart{
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion372S, Namespace: kyvernoNamespace},
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion391S, Namespace: kyvernoNamespace},
}
verifyClusterConfiguration(configv1beta1.ClusterProfileKind, helmClusterProfile.Name,
helmClusterSummary.Spec.ClusterNamespace, helmClusterSummary.Spec.ClusterName, libsveltosv1beta1.FeatureHelm,
Expand Down
8 changes: 4 additions & 4 deletions test/fv/capi_onboard_annotation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var _ = Describe("Helm", Serial, func() {
RepositoryURL: prometheusCommunityURL,
RepositoryName: prometheusCommunityName,
ChartName: prometheusChartName,
ChartVersion: prometheusVersion2524,
ChartVersion: prometheusVersion2930,
ReleaseName: prometheusRelease,
ReleaseNamespace: prometheusRelease,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand All @@ -81,7 +81,7 @@ var _ = Describe("Helm", Serial, func() {
RepositoryURL: "https://grafana-community.github.io/helm-charts",
RepositoryName: grafanaRepoName,
ChartName: grafanaChartName,
ChartVersion: grafanaVersion1136,
ChartVersion: grafanaVersion1325,
ReleaseName: grafanaRepoName,
ReleaseNamespace: grafanaRepoName,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -145,8 +145,8 @@ var _ = Describe("Helm", Serial, func() {
libsveltosv1beta1.FeatureHelm)

charts := []configv1beta1.Chart{
{ReleaseName: grafanaRepoName, ChartVersion: grafanaVersion1136, Namespace: grafanaRepoName},
{ReleaseName: prometheusRelease, ChartVersion: prometheusVersion2524, Namespace: prometheusRelease},
{ReleaseName: grafanaRepoName, ChartVersion: grafanaVersion1325, Namespace: grafanaRepoName},
{ReleaseName: prometheusRelease, ChartVersion: prometheusVersion2930, Namespace: prometheusRelease},
}

verifyClusterConfiguration(configv1beta1.ClusterProfileKind, clusterProfile.Name,
Expand Down
10 changes: 5 additions & 5 deletions test/fv/continue_on_error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ var _ = Describe("Feature", Serial, func() {
RepositoryURL: "https://charts.konghq.com",
RepositoryName: kongRepoName,
ChartName: "kong/kong",
ChartVersion: kongVersion2510,
ChartVersion: kongVersion341,
ReleaseName: kongRepoName,
ReleaseNamespace: kongRepoName,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand All @@ -133,7 +133,7 @@ var _ = Describe("Feature", Serial, func() {
RepositoryURL: jetstackURL,
RepositoryName: jetstackName,
ChartName: jetstackCertManagerChart,
ChartVersion: "v1.16.2",
ChartVersion: certManagerVersion1212,
ReleaseName: certManager,
ReleaseNamespace: certManager,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand All @@ -145,7 +145,7 @@ var _ = Describe("Feature", Serial, func() {
RepositoryURL: "https://helm.nginx.com/stable/",
RepositoryName: "nginx-stable",
ChartName: "nginx-stable/nginx-ingress",
ChartVersion: nginxVersion222,
ChartVersion: nginxVersion272,
ReleaseName: nginxLatestRelease,
ReleaseNamespace: nginxNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -175,8 +175,8 @@ var _ = Describe("Feature", Serial, func() {
kindWorkloadCluster.GetNamespace(), kindWorkloadCluster.GetName(), getClusterType())

charts := []configv1beta1.Chart{
{ReleaseName: kongRepoName, ChartVersion: kongVersion2510, Namespace: kongRepoName},
{ReleaseName: nginxLatestRelease, ChartVersion: nginxVersion222, Namespace: nginxNamespace},
{ReleaseName: kongRepoName, ChartVersion: kongVersion341, Namespace: kongRepoName},
{ReleaseName: nginxLatestRelease, ChartVersion: nginxVersion272, Namespace: nginxNamespace},
}

verifyClusterConfiguration(configv1beta1.ClusterProfileKind, clusterProfile.Name,
Expand Down
8 changes: 4 additions & 4 deletions test/fv/dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ var _ = Describe("Dependencies", func() {
metricsServerRepoURL = "https://kubernetes-sigs.github.io/metrics-server/"
metricsServerRepoName = "metrics-server"
metricsServerChartName = "metrics-server/metrics-server"
metricsServerVersion = "3.13.1"
metricsServerVersion = "3.14.0"
metricsServerRelease = "metrics-server"
reloaderChartRepoURL = "https://stakater.github.io/stakater-charts"
reloaderChartRepoName = "stakater"
reloaderHelmChartName = "stakater/reloader"
reloaderHelmVersion = "2.2.16"
reloaderHelmVersion = "2.2.17"
reloaderHelmReleaseName = "stakater-reloader"
)

Expand All @@ -68,7 +68,7 @@ var _ = Describe("Dependencies", func() {
RepositoryURL: bitnamiURL,
RepositoryName: bitnamiName,
ChartName: "bitnami/flink",
ChartVersion: "1.4.0",
ChartVersion: "2.0.7",
ReleaseName: flinkRelease,
ReleaseNamespace: flinkRelease,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -111,7 +111,7 @@ var _ = Describe("Dependencies", func() {
RepositoryURL: "https://airflow.apache.org",
RepositoryName: "apache-airflow",
ChartName: "apache-airflow/airflow",
ChartVersion: "1.15.0",
ChartVersion: "1.22.0",
ReleaseName: airflowRelease,
ReleaseNamespace: airflowRelease,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down
2 changes: 1 addition & 1 deletion test/fv/helm_conflict_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var _ = Describe("Helm with conflicts", func() {
clusterProfile.Name, &clusterProfile.Spec,
kindWorkloadCluster.GetNamespace(), kindWorkloadCluster.GetName(), getClusterType())

sparkVersion := "9.3.0"
sparkVersion := "10.0.3"
addSparkHelmChart(clusterProfile.Name, sparkVersion)

currentClusterProfile := &configv1beta1.ClusterProfile{}
Expand Down
2 changes: 1 addition & 1 deletion test/fv/helm_error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ var _ = Describe("HelmSourceIntegrity", func() {
RepositoryURL: jetstackURL,
RepositoryName: jetstackName,
ChartName: jetstackCertManagerChart,
ChartVersion: "v1.19.4",
ChartVersion: certManagerVersion1212,
ReleaseName: certManager,
ReleaseNamespace: certManager,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down
2 changes: 1 addition & 1 deletion test/fv/helm_failure_message_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var _ = Describe("Helm with conflicts", func() {
RepositoryURL: k0rdentCatalogURL,
RepositoryName: ingressNginxName,
ChartName: ingressNginxName,
ChartVersion: "4.13.0",
ChartVersion: "4.15.1",
ReleaseName: nginxNamespace,
ReleaseNamespace: nginxNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down
4 changes: 2 additions & 2 deletions test/fv/helm_handoff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ const (
dragonflyDeployment = "dragonfly-operator"
dragonflyOCIURL = "oci://ghcr.io/dragonflydb/dragonfly-operator/helm"
dragonflyChartName = "dragonfly-operator"
dragonflyVersionA = "v1.5.0"
dragonflyVersionB = "v1.4.0"
dragonflyVersionA = "v1.6.1"
dragonflyVersionB = "v1.6.0"
handoffLabelValue = "fv-handoff"
)

Expand Down
12 changes: 6 additions & 6 deletions test/fv/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var _ = Describe("Helm", func() {
RepositoryURL: kyvernoRepoURL,
RepositoryName: kyvernoNamespace,
ChartName: kyvernoChartName,
ChartVersion: "v3.7.1",
ChartVersion: kyvernoVersion391,
ReleaseName: kyvernoLatestRelease,
ReleaseNamespace: kyvernoNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -149,7 +149,7 @@ var _ = Describe("Helm", func() {
verifyFeatureStatusIsProvisioned(kindWorkloadCluster.GetNamespace(), clusterSummary.Name, libsveltosv1beta1.FeatureHelm)

charts := []configv1beta1.Chart{
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion371S, Namespace: kyvernoNamespace},
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion391S, Namespace: kyvernoNamespace},
{ReleaseName: wildflyName, ChartVersion: wildflyVersion, Namespace: wildflyName},
}

Expand All @@ -164,7 +164,7 @@ var _ = Describe("Helm", func() {
RepositoryURL: kyvernoRepoURL,
RepositoryName: kyvernoNamespace,
ChartName: kyvernoChartName,
ChartVersion: kyvernoVersion370,
ChartVersion: kyvernoVersion390,
ReleaseName: kyvernoLatestRelease,
ReleaseNamespace: kyvernoNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -219,7 +219,7 @@ var _ = Describe("Helm", func() {
verifyFeatureStatusIsProvisioned(kindWorkloadCluster.GetNamespace(), clusterSummary.Name, libsveltosv1beta1.FeatureHelm)

charts = []configv1beta1.Chart{
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion370S, Namespace: kyvernoNamespace},
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion390S, Namespace: kyvernoNamespace},
{ReleaseName: wildflyName, ChartVersion: wildflyVersion, Namespace: wildflyName},
}

Expand All @@ -245,7 +245,7 @@ var _ = Describe("Helm", func() {
RepositoryURL: kyvernoRepoURL,
RepositoryName: kyvernoNamespace,
ChartName: kyvernoChartName,
ChartVersion: kyvernoVersion370,
ChartVersion: kyvernoVersion390,
ReleaseName: kyvernoLatestRelease,
ReleaseNamespace: kyvernoNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -273,7 +273,7 @@ var _ = Describe("Helm", func() {
}, timeout, pollingInterval).Should(BeTrue())

charts = []configv1beta1.Chart{
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion370S, Namespace: kyvernoNamespace},
{ReleaseName: kyvernoLatestRelease, ChartVersion: kyvernoVersion390S, Namespace: kyvernoNamespace},
}

verifyClusterConfiguration(configv1beta1.ClusterProfileKind, clusterProfile.Name,
Expand Down
2 changes: 1 addition & 1 deletion test/fv/kustomize_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ installCRDs: true`
RepositoryURL: "https://fluxcd-community.github.io/helm-charts",
RepositoryName: flux2Name,
ChartName: "flux2/flux2",
ChartVersion: "2.18.2",
ChartVersion: "2.19.0",
ReleaseName: flux2Name,
ReleaseNamespace: gitRepositoryNamespace,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down
4 changes: 2 additions & 2 deletions test/fv/optional_referenced_resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ metadata:
RepositoryURL: prometheusCommunityURL,
RepositoryName: prometheusCommunityName,
ChartName: prometheusChartName,
ChartVersion: prometheusVersion2524,
ChartVersion: prometheusVersion2930,
ReleaseName: prometheusRelease,
ReleaseNamespace: prometheusRelease,
HelmChartAction: configv1beta1.HelmChartActionInstall,
Expand Down Expand Up @@ -130,7 +130,7 @@ metadata:
kindWorkloadCluster.GetNamespace(), kindWorkloadCluster.GetName(), getClusterType())

charts := []configv1beta1.Chart{
{ReleaseName: prometheusRelease, ChartVersion: prometheusVersion2524, Namespace: prometheusRelease},
{ReleaseName: prometheusRelease, ChartVersion: prometheusVersion2930, Namespace: prometheusRelease},
}

verifyClusterConfiguration(configv1beta1.ClusterProfileKind, clusterProfile.Name,
Expand Down
2 changes: 1 addition & 1 deletion test/fv/templated_valuesfrom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var _ = Describe("Helm", func() {
clusterProfile.Spec.HelmCharts = []configv1beta1.HelmChart{
{
ChartName: "hashicorp/vault-secrets-operator",
ChartVersion: "1.2.0",
ChartVersion: "1.5.1",
ReleaseName: "vso",
ReleaseNamespace: randomString(),
RepositoryName: "hashicorp",
Expand Down
42 changes: 18 additions & 24 deletions test/fv/test_constants_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,35 @@ const (
kyvernoChartName = "kyverno/kyverno"
kyvernoNamespace = "kyverno"
admissionControllerDeplName = "kyverno-admission-controller"
kyvernoVersion382 = "v3.8.2"
kyvernoVersion382S = "3.8.2"
kyvernoVersion381 = "v3.8.1"
kyvernoVersion381S = "3.8.1"
kyvernoVersion372 = "v3.7.2"
kyvernoVersion372S = "3.7.2"
kyvernoVersion371 = "v3.7.1"
kyvernoVersion371S = "3.7.1"
kyvernoVersion391 = "v3.9.1"
kyvernoVersion391S = "3.9.1"
kyvernoVersion390 = "v3.9.0"
kyvernoVersion390S = "3.9.0"
kyvernoLatestRelease = "kyverno-latest"

// Prometheus community chart details
prometheusCommunityURL = "https://prometheus-community.github.io/helm-charts"
prometheusCommunityName = "prometheus-community"
prometheusChartName = "prometheus-community/prometheus"
prometheusVersion2524 = "25.24.0"
prometheusVersion2739 = "27.39.0"
prometheusVersion2930 = "29.30.0"
prometheusRelease = "prometheus"

// Grafana chart details
grafanaRepoName = "grafana"
grafanaChartName = "grafana/grafana"
grafanaVersion1136 = "11.3.6"
grafanaVersion1000 = "10.0.0"
grafanaRepoName = "grafana"
grafanaChartName = "grafana/grafana"
grafanaVersion1325 = "13.2.5"
grafanaVersion10515 = "10.5.15"

// Jetstack/cert-manager chart details
jetstackURL = "https://charts.jetstack.io"
jetstackName = "jetstack"
jetstackCertManagerChart = "jetstack/cert-manager"
certManager = "cert-manager"
certManagerVersion1212 = "v1.21.2"

// Kong chart details
kongRepoName = "kong"
kongVersion2510 = "2.51.0"
kongRepoName = "kong"
kongVersion341 = "3.4.1"

// External-DNS chart details
externalDNSURL = "https://kubernetes-sigs.github.io/external-dns/"
Expand All @@ -70,7 +66,7 @@ const (
// NGINX chart details
nginxLatestRelease = "nginx-latest"
nginxNamespace = "nginx"
nginxVersion222 = "2.2.2"
nginxVersion272 = "2.7.2"

// Release names
airflowRelease = "airflow"
Expand Down Expand Up @@ -110,15 +106,15 @@ const (
mariadbOperatorChart = "mariadb-operator/mariadb-operator"
mariadbVersion0351 = "0.35.1"
mariadbRelease = "mariadb"
prometheusVersion2584 = "25.8.4"
externalDNSVersion1182 = "v1.18.2"
prometheusVersion2584 = "26.6.0"
externalDNSVersion1182 = "v1.21.2"
crdsEnabledValues = "crds:\n enabled: true"

// CloudNative-PG chart details
cloudnativePGURL = "https://cloudnative-pg.github.io/charts"
cloudnativePGName = "cloudnative-pg"
cloudnativePGChart = "cloudnative-pg/cloudnative-pg"
cloudnativePGVersion = "0.26.0"
cloudnativePGVersion = "0.29.0"
cnpgRelease = "cnpg"
cnpgSystem = "cnpg-system"

Expand Down Expand Up @@ -220,11 +216,9 @@ const (

// Helm chart versions
externalDNSVersion1170 = "1.17.0"
argocdChartVersion = "3.35.4"
argocdChartVersion = "10.9.1"
wildflyVersion = "2.4.0"
kyvernoVersion370 = "v3.7.0"
kyvernoVersion370S = "3.7.0"
kubePrometheusVersion = "75.9.0"
kubePrometheusVersion = "91.4.1"

// ArgoCD chart
argocdName = "argocd"
Expand Down
Loading