Skip to content

Commit

Permalink
Upgrade skaffold
Browse files Browse the repository at this point in the history
Summary:
This upgrades skaffold to a new major release and uses the skaffold
fix helper to update our configs.

Test Plan:
Deployed dev cloud with new skaffold and new configs. Ensured that it
worked.

Reviewers: zasgar, jamesbartlett, michelle

Reviewed By: zasgar

Signed-off-by: Vihang Mehta <vihang@pixielabs.ai>

Differential Revision: https://phab.corp.pixielabs.ai/D12766

GitOrigin-RevId: be574c63257c19a494af35f465ddad069e4764b2
  • Loading branch information
vihangm authored and copybaranaut committed Jan 12, 2023
1 parent ccb7618 commit 747915b
Showing 13 changed files with 64 additions and 60 deletions.
2 changes: 1 addition & 1 deletion docker.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DOCKER_IMAGE_TAG=202301111724
DOCKER_IMAGE_TAG=202301112144
55 changes: 31 additions & 24 deletions skaffold/skaffold_cloud.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -67,42 +67,47 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- k8s/cloud/dev
profiles:
- name: minikube
activation:
- kubeContext: minikube
patches:
- op: replace
path: /build/local
value:
push: false
activation:
- kubeContext: minikube
- name: dev
activation:
- command: dev
patches:
- op: add
path: /build/artifacts/context=./bazel/args
value:
- --compilation_mode=dbg
activation:
- command: dev
- name: ory_auth
patches:
- op: replace
path: /deploy/kustomize/paths
value: [k8s/cloud/dev, k8s/cloud/dev/ory_auth]
path: /manifests/kustomize/paths
value:
- k8s/cloud/dev
- k8s/cloud/dev/ory_auth
- op: add
path: /build/artifacts/context=./bazel/args
value:
- --compilation_mode=dbg
- name: ory_auth_prod
patches:
- op: add
path: /deploy/kustomize/paths
value: [k8s/cloud/base/ory_auth]
path: /manifests/kustomize/paths
value:
- k8s/cloud/base/ory_auth
- name: staging
activation:
- env: PL_BUILD_TYPE=staging
patches:
- op: add
path: /build/artifacts/context=./bazel/args
@@ -111,11 +116,12 @@ profiles:
- --stamp
- --action_env=GOOGLE_APPLICATION_CREDENTIALS
- op: replace
path: /deploy/kustomize/paths
value: [k8s/cloud/staging]
activation:
- env: PL_BUILD_TYPE=staging
path: /manifests/kustomize/paths
value:
- k8s/cloud/staging
- name: testing
activation:
- env: PL_BUILD_TYPE=testing
patches:
- op: add
path: /build/artifacts/context=./bazel/args
@@ -124,11 +130,12 @@ profiles:
- --stamp
- --action_env=GOOGLE_APPLICATION_CREDENTIALS
- op: replace
path: /deploy/kustomize/paths
value: [k8s/cloud/testing]
activation:
- env: PL_BUILD_TYPE=testing
path: /manifests/kustomize/paths
value:
- k8s/cloud/testing
- name: prod
activation:
- env: PL_BUILD_TYPE=prod
patches:
- op: add
path: /build/artifacts/context=./bazel/args
@@ -137,12 +144,12 @@ profiles:
- --stamp
- --action_env=GOOGLE_APPLICATION_CREDENTIALS
- op: replace
path: /deploy/kustomize/paths
value: [k8s/cloud/prod]
activation:
- env: PL_BUILD_TYPE=prod
path: /manifests/kustomize/paths
value:
- k8s/cloud/prod
- name: public
patches:
- op: replace
path: /deploy/kustomize/paths
value: [k8s/cloud/public]
path: /manifests/kustomize/paths
value:
- k8s/cloud/public
8 changes: 4 additions & 4 deletions skaffold/skaffold_operator.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -9,16 +9,16 @@ build:
target: //src/operator:operator_image.tar
tagPolicy:
dateTime: {}
deploy:
manifests:
kustomize:
paths:
- k8s/operator/deployment/base/
profiles:
- name: minikube
activation:
- kubeContext: minikube
patches:
- op: replace
path: /build/local
value:
push: false
activation:
- kubeContext: minikube
23 changes: 10 additions & 13 deletions skaffold/skaffold_vizier.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
# NOTE: If you move either pem/kelvin for the first two spots
# then you will have to update the ASAN/TSAN yaml-path
# index below.
- image: gcr.io/pixie-oss/pixie-dev/vizier/pem_image
context: .
bazel:
@@ -46,19 +43,19 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- k8s/vizier/persistent_metadata
profiles:
- name: minikube
activation:
- kubeContext: minikube
patches:
- op: replace
path: /build/local
value:
push: false
activation:
- kubeContext: minikube
- name: dbg
patches:
- op: add
@@ -74,19 +71,19 @@ profiles:
- name: jsyms
patches:
- op: add
path: /deploy/kustomize/paths
path: /manifests/kustomize/paths
value:
- k8s/vizier/jsyms
- name: no-jsyms
patches:
- op: add
path: /deploy/kustomize/paths
path: /manifests/kustomize/paths
value:
- k8s/vizier/no-jsyms
- name: heap
patches:
- op: add
path: /deploy/kustomize/paths
path: /manifests/kustomize/paths
value:
- k8s/vizier/heap_profile
- name: asan
@@ -100,7 +97,7 @@ profiles:
value:
- --config=asan
- op: replace
path: /deploy/kustomize/paths
path: /manifests/kustomize/paths
value:
- k8s/vizier/sanitizer
- name: tsan
@@ -114,12 +111,12 @@ profiles:
value:
- --config=tsan
- op: replace
path: /deploy/kustomize/paths
path: /manifests/kustomize/paths
value:
- k8s/vizier/sanitizer
- name: etcd
patches:
- op: replace
path: /deploy/kustomize/paths
path: /manifests/kustomize/paths
value:
- k8s/vizier/etcd_metadata
4 changes: 2 additions & 2 deletions src/e2e_test/jetstream_loadtest/skaffold_loadtest.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -15,7 +15,7 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/jetstream_loadtest/k8s/
4 changes: 2 additions & 2 deletions src/e2e_test/perf_tool/backend/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -23,7 +23,7 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/perf_tool/backend/k8s
4 changes: 2 additions & 2 deletions src/e2e_test/profiler_loadtest/skaffold_loadtest.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -11,7 +11,7 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/profiler_loadtest/k8s/
4 changes: 2 additions & 2 deletions src/e2e_test/protocol_loadtest/http/wrk/skaffold_wrk.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -9,7 +9,7 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/protocol_loadtest/http/wrk/k8s
4 changes: 2 additions & 2 deletions src/e2e_test/protocol_loadtest/skaffold_client.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -11,7 +11,7 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/protocol_loadtest/k8s/client
4 changes: 2 additions & 2 deletions src/e2e_test/protocol_loadtest/skaffold_loadtest.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -11,7 +11,7 @@ build:
dateTime: {}
local:
push: true
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/protocol_loadtest/k8s/server
4 changes: 2 additions & 2 deletions src/e2e_test/vzconn_loadtest/skaffold_loadtest.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: skaffold/v2alpha3
apiVersion: skaffold/v4beta1
kind: Config
build:
artifacts:
@@ -9,7 +9,7 @@ build:
target: //src/e2e_test/vzconn_loadtest:server_image.tar
tagPolicy:
dateTime: {}
deploy:
manifests:
kustomize:
paths:
- src/e2e_test/vzconn_loadtest/k8s
4 changes: 2 additions & 2 deletions tools/chef/cookbooks/px_dev/attributes/linux.rb
Original file line number Diff line number Diff line change
@@ -113,9 +113,9 @@
'39c501aaca6aae3f3c7fc125b3c3af779ddbe4e67e4ebdc44c2ae5cba76c847f'

default['skaffold']['download_path'] =
'https://storage.googleapis.com/skaffold/releases/v1.38.0/skaffold-linux-amd64'
'https://storage.googleapis.com/skaffold/releases/v2.0.4/skaffold-linux-amd64'
default['skaffold']['sha256'] =
'3c347c9478880f22ebf95807c13371844769c625cf3ea9c987cd85859067503c'
'f1c54245b97073f39b209dd4b769802701c9901ceaa95774e7507d95bbd1d4c0'

default['sops']['download_path'] =
'https://github.com/mozilla/sops/releases/download/3.3.1/sops-3.3.1.linux'
4 changes: 2 additions & 2 deletions tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb
Original file line number Diff line number Diff line change
@@ -114,9 +114,9 @@
'c4edf1f04e53a35c39a7ef83598f2c50d36772e4cc942fb08a1114f9d48e5380'

default['skaffold']['download_path'] =
'https://storage.googleapis.com/skaffold/releases/v1.38.0/skaffold-darwin-amd64'
'https://storage.googleapis.com/skaffold/releases/v2.0.4/skaffold-darwin-amd64'
default['skaffold']['sha256'] =
'872897d78a17812913cd6e930c5d1c94f7c862381db820815c4bffc637c28b88'
'd0956712db4d2dd8084ffe297bf645ec92506b87db5f61c0f5e24c7fd99bf0a3'

default['sops']['download_path'] =
'https://github.com/mozilla/sops/releases/download/3.3.1/sops-3.3.1.darwin'

0 comments on commit 747915b

Please sign in to comment.