Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROX-27129: remove tenant-resources helm chart #2131

Merged
merged 1 commit into from
Jan 17, 2025
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
3 changes: 0 additions & 3 deletions .openshift-ci/tests/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ if [[ "$SPAWN_LOGGER" == "true" ]]; then
fi

FAIL=0
if ! "${GITROOT}/.openshift-ci/tests/netpol-test.sh"; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we still need those tests? Are we going to move them to the gitops repository? How about creating a follow-up ticket?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we still need them, but I can create a follow-up ticket.

FAIL=1
fi

if ! "${GITROOT}/.openshift-ci/tests/e2e-test.sh"; then
FAIL=1
Expand Down
171 changes: 0 additions & 171 deletions .openshift-ci/tests/netpol-test.sh

This file was deleted.

11 changes: 7 additions & 4 deletions e2e/e2e_canary_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,11 @@ labels:
rhacs.redhat.com/instance-type: "{{ .InstanceType }}"
annotations:
rhacs.redhat.com/org-name: "{{ .OrganizationName }}"
argoCd:
enabled: true
secureTenantNetwork: false
centralRdsCidrBlock: "10.1.0.0/16"`
centralRdsCidrBlock: "10.1.0.0/16"
centralVpaEnabled: false`
}

func tenantResourcesWithCentralVpaEnabled() string {
Expand All @@ -598,13 +601,13 @@ labels:
rhacs.redhat.com/org-id: "{{ .OrganizationID }}"
rhacs.redhat.com/tenant: "{{ .ID }}"
rhacs.redhat.com/instance-type: "{{ .InstanceType }}"
argoCd:
enabled: true
annotations:
rhacs.redhat.com/org-name: "{{ .OrganizationName }}"
secureTenantNetwork: false
centralRdsCidrBlock: "10.1.0.0/16"
verticalPodAutoscalers:
central:
enabled: true
centralVpaEnabled: true
`
}

Expand Down
11 changes: 1 addition & 10 deletions fleetshard/pkg/central/charts/charts.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var (
// The templates/* entry is necessary because files starting with an underscore are only embedded when matched
// via *, not when recursively traversing a directory. Once we switch to go1.18, we can change the embed spec
// to all:data.
//go:embed data data/tenant-resources/templates/*
//go:embed data/*
data embed.FS
)

Expand Down Expand Up @@ -120,15 +120,6 @@ func GetChart(name string, urls []string) (*chart.Chart, error) {
return loadedChart, nil
}

// MustGetChart loads a chart from the data directory. Unlike GetChart, it panics if an error is encountered.
func MustGetChart(name string, urls []string) *chart.Chart {
chrt, err := GetChart(name, urls)
if err != nil {
panic(err)
}
return chrt
}

// InstallOrUpdateChart installs a new object from helm chart or update an existing object with the same Name, Namespace and Kind
func InstallOrUpdateChart(ctx context.Context, obj *unstructured.Unstructured, client ctrlClient.Client) error {
key := ctrlClient.ObjectKey{Namespace: obj.GetNamespace(), Name: obj.GetName()}
Expand Down
6 changes: 0 additions & 6 deletions fleetshard/pkg/central/charts/charts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ var dummyDeployment = &appsv1.Deployment{
},
}

func TestTenantResourcesChart(t *testing.T) {
c, err := GetChart("tenant-resources", nil)
require.NoError(t, err)
assert.NotNil(t, c)
}

func TestInstallOrUpdateChartCreateNew(t *testing.T) {
chart := mustGetChart(t, "test-chart")
fakeClient := testutils.NewFakeClientBuilder(t).Build()
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions fleetshard/pkg/central/charts/data/tenant-resources/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading