Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
barchw committed Dec 13, 2024
1 parent c526d0e commit b43dcf1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
generate-integration-test-manifest: manifests kustomize module-version
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default -o tests/integration/steps/operator_generated_manifest.yaml
yq eval '(.spec.template.spec.containers[0].env //= []) += {"name": "DEBUG_PRINT_IOP", "value": "true"}' -i my-app-deployment.yaml

.PHONY: generate
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
Expand Down
8 changes: 8 additions & 0 deletions internal/istiooperator/istio-operator-light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ spec:
topologyKey: kubernetes.io/hostname
weight: 100
hpaSpec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: istio-ingressgateway
maxReplicas: 1
minReplicas: 1
resources:
Expand Down Expand Up @@ -106,6 +110,10 @@ spec:
- name: METRIC_GRACEFUL_DELETION_INTERVAL
value: "5m0s"
hpaSpec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: istiod
maxReplicas: 1
minReplicas: 1
podAnnotations:
Expand Down
2 changes: 1 addition & 1 deletion internal/reconciliations/istio/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (c *IstioClient) Uninstall(ctx context.Context) error {

pl := progress.NewLog()

objectsList, err := uninstall.GetPrunedResources(kubeClient, "", "", "default", false)
objectsList, err := uninstall.GetPrunedResources(kubeClient, "", "", "default", true)
if err != nil {
return err
}
Expand Down

0 comments on commit b43dcf1

Please sign in to comment.