Skip to content

Commit

Permalink
helm: remove konnectivity agents (#2790)
Browse files Browse the repository at this point in the history
  • Loading branch information
3u13r authored Jan 3, 2024
1 parent 3d8e548 commit 0167a4a
Show file tree
Hide file tree
Showing 30 changed files with 0 additions and 681 deletions.
1 change: 0 additions & 1 deletion e2e/miniconstellation/test-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ kubectl -n kube-system wait --for=condition=Available=True --timeout=180s deploy
kubectl -n kube-system rollout status --timeout 180s daemonset cilium
kubectl -n kube-system rollout status --timeout 180s daemonset join-service
kubectl -n kube-system rollout status --timeout 180s daemonset key-service
kubectl -n kube-system rollout status --timeout 180s daemonset konnectivity-agent
kubectl -n kube-system rollout status --timeout 180s daemonset verification-service

echo "Miniconstellation started successfully. Shutting down..."
Expand Down
7 changes: 0 additions & 7 deletions internal/constellation/helm/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,6 @@ go_library(
"charts/edgeless/constellation-services/charts/key-service/templates/serviceaccount.yaml",
"charts/edgeless/constellation-services/charts/key-service/values.schema.json",
"charts/edgeless/constellation-services/charts/key-service/values.yaml",
"charts/edgeless/constellation-services/charts/konnectivity/.helmignore",
"charts/edgeless/constellation-services/charts/konnectivity/Chart.yaml",
"charts/edgeless/constellation-services/charts/konnectivity/templates/clusterrolebinding.yaml",
"charts/edgeless/constellation-services/charts/konnectivity/templates/daemonset.yaml",
"charts/edgeless/constellation-services/charts/konnectivity/templates/serviceaccount.yaml",
"charts/edgeless/constellation-services/charts/konnectivity/values.schema.json",
"charts/edgeless/constellation-services/charts/konnectivity/values.yaml",
"charts/edgeless/constellation-services/charts/verification-service/.helmignore",
"charts/edgeless/constellation-services/charts/verification-service/Chart.yaml",
"charts/edgeless/constellation-services/charts/verification-service/templates/daemonset.yaml",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ dependencies:
- GCP
- OpenStack
- QEMU
- name: konnectivity
version: 0.0.0
tags:
- AWS
- Azure
- GCP
- OpenStack
- QEMU
- name: gcp-guest-agent
version: 0.0.0
tags:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions internal/constellation/helm/imageversion/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@ go_library(
# TODO(malt3): add missing third-party images
# - logstash
# - filebeat
# - konnectivity-agent
# - konnectivity-server
# - node-maintenance-operator
# - gcp-guest-agent
5 changes: 0 additions & 5 deletions internal/constellation/helm/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ type chartLoader struct {
autoscalerImage string
verificationServiceImage string
gcpGuestAgentImage string
konnectivityImage string
constellationOperatorImage string
nodeMaintenanceOperatorImage string
clusterName string
Expand Down Expand Up @@ -104,7 +103,6 @@ func newLoader(csp cloudprovider.Provider, attestationVariant variant.Variant, k
autoscalerImage: versions.VersionConfigs[k8sVersion].ClusterAutoscalerImage,
verificationServiceImage: imageversion.VerificationService("", ""),
gcpGuestAgentImage: versions.GcpGuestImage,
konnectivityImage: versions.KonnectivityAgentImage,
constellationOperatorImage: imageversion.ConstellationNodeOperator("", ""),
nodeMaintenanceOperatorImage: versions.NodeMaintenanceOperatorImage,
}
Expand Down Expand Up @@ -307,9 +305,6 @@ func (i *chartLoader) loadConstellationServicesValues() map[string]any {
"gcp-guest-agent": map[string]any{
"image": i.gcpGuestAgentImage,
},
"konnectivity": map[string]any{
"image": i.konnectivityImage,
},
"tags": i.cspTags(),
}
}
Expand Down
7 changes: 0 additions & 7 deletions internal/constellation/helm/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ func TestConstellationServices(t *testing.T) {
azureCNMImage: tc.cnmImage,
autoscalerImage: "autoscalerImage",
verificationServiceImage: "verificationImage",
konnectivityImage: "konnectivityImage",
gcpGuestAgentImage: "gcpGuestAgentImage",
clusterName: "testCluster",
}
Expand Down Expand Up @@ -384,12 +383,6 @@ func addInClusterValues(values map[string]any, csp cloudprovider.Provider) error
}
verificationVals["loadBalancerIP"] = "127.0.0.1"

konnectivityVals, ok := values["konnectivity"].(map[string]any)
if !ok {
return errors.New("missing 'konnectivity' key")
}
konnectivityVals["loadBalancerIP"] = "127.0.0.1"

ccmVals, ok := values["ccm"].(map[string]any)
if !ok {
return errors.New("missing 'ccm' key")
Expand Down
3 changes: 0 additions & 3 deletions internal/constellation/helm/overrides.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ func extraConstellationServicesValues(
extraVals["verification-service"] = map[string]any{
"attestationVariant": attestationVariant.String(),
}
extraVals["konnectivity"] = map[string]any{
"loadBalancerIP": output.ClusterEndpoint,
}

extraVals["key-service"] = map[string]any{
"masterSecret": base64.StdEncoding.EncodeToString(masterSecret.Key),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 0167a4a

Please sign in to comment.