Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-09-19 20:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

helm: revert parts of CoreDNS Helm chart packaging (#3366)

Browse source 
* Revert "helm: fix kubeadm bugs caused by CoreDNS installation (#3353)"

This reverts commit 8ef5ea2efe.

* Revert "helm: manage CoreDNS addon as Helm chart (#3236)"

This reverts commit 97c77e2a78.

* upgrade-agent: ignore CoreDNS preflight errors
This commit is contained in:
Markus Rudy 2024-09-19 10:55:21 +02:00 • committed by GitHub
parent 89eb8ca6ae
commit 850b460002
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 69 additions and 750 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/internal/cmd/apply.go
View file

@ -428,9 +428,6 @@ func (a *applyCmd) apply(
if err := a.runHelmApply(cmd, conf, stateFile, upgradeDir); err != nil {
return err
}
if err := a.applier.CleanupCoreDNSResources(cmd.Context()); err != nil {
return fmt.Errorf("cleaning up CoreDNS: %w", err)
}
}
// Upgrade node image
@ -850,7 +847,6 @@ type applier interface {
// methods required to install/upgrade Helm charts
AnnotateCoreDNSResources(context.Context) error
CleanupCoreDNSResources(context.Context) error
PrepareHelmCharts(
flags helm.Options, state *state.State, serviceAccURI string, masterSecret uri.MasterSecret,
) (helm.Applier, bool, error)

1
cli/internal/cmd/apply_test.go
View file

@ -554,7 +554,6 @@ func (s *stubConstellApplier) Init(context.Context, atls.Validator, *state.State
type helmApplier interface {
AnnotateCoreDNSResources(context.Context) error
CleanupCoreDNSResources(ctx context.Context) error
PrepareHelmCharts(
flags helm.Options, stateFile *state.State, serviceAccURI string, masterSecret uri.MasterSecret,
) (

1
cli/internal/cmd/applyhelm.go
View file

@ -42,7 +42,6 @@ func (a *applyCmd) runHelmApply(cmd *cobra.Command, conf *config.Config, stateFi
HelmWaitMode: a.flags.helmWaitMode,
ApplyTimeout: a.flags.helmTimeout,
AllowDestructive: helm.DenyDestructive,
ServiceCIDR: conf.ServiceCIDR,
}
if conf.Provider.OpenStack != nil {
var deployYawolLoadBalancer bool

4
cli/internal/cmd/init_test.go
View file

@ -282,10 +282,6 @@ func (s stubHelmApplier) AnnotateCoreDNSResources(_ context.Context) error {
return nil
}
func (s stubHelmApplier) CleanupCoreDNSResources(_ context.Context) error {
return nil
}
func (s stubHelmApplier) PrepareHelmCharts(
_ helm.Options, _ *state.State, _ string, _ uri.MasterSecret,
) (helm.Applier, bool, error) {

4
cli/internal/cmd/upgradeapply_test.go
View file

@ -379,10 +379,6 @@ func (m *mockApplier) AnnotateCoreDNSResources(_ context.Context) error {
return nil
}
func (m *mockApplier) CleanupCoreDNSResources(_ context.Context) error {
return nil
}
func (m *mockApplier) PrepareHelmCharts(
helmOpts helm.Options, stateFile *state.State, str string, masterSecret uri.MasterSecret,
) (helm.Applier, bool, error) {