Skip to content

Commit

Permalink
skaffold fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rrhubenov committed Jan 13, 2025
1 parent f27e316 commit 5ed7131
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
---
apiVersion: skaffold/v4beta3
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: extension
Expand Down Expand Up @@ -91,9 +91,18 @@ manifests:
paths:
- local-setup
deploy:
kubectl: {}
# --server-side apply is a workaround for https://github.com/gardener/gardener/issues/10267.
# kubectl apply attempts a strategic merge patch which fails for a ControllerDeployment.
# For more details, see https://github.com/gardener/gardener/issues/10267.
#
# TODO: Switch back to "kubectl: {}" when the above issue is resolved.
kubectl:
flags:
apply:
- --server-side
- --force-conflicts
---
apiVersion: skaffold/v4beta3
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: admission
Expand Down

0 comments on commit 5ed7131

Please sign in to comment.