Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump examples to v4beta2 after v2.1.0 release #8355

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/bazel/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks-java/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks-node/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks-python/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/cross-platform-builds/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-buildx/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
platforms: ["linux/amd64", "linux/arm64"]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-tests/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/dev-journey-buildpacks/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-deploy/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
local:
Expand Down
2 changes: 1 addition & 1 deletion examples/gcb-kaniko/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
googleCloudBuild:
Expand Down
4 changes: 2 additions & 2 deletions examples/generate-pipeline/expectedPipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /secret/kaniko-secret
image: gcr.io/k8s-skaffold/skaffold:latest
image: us-central1-docker.pkg.dev/k8s-skaffold/testing/skaffold:latest
name: run-build
resources: {}
volumeMounts:
Expand Down Expand Up @@ -75,7 +75,7 @@ spec:
command:
- skaffold
- deploy
image: gcr.io/k8s-skaffold/skaffold:latest
image: us-central1-docker.pkg.dev/k8s-skaffold/testing/skaffold:latest
name: run-deploy
resources: {}
workingDir: /workspace/source
Expand Down
2 changes: 1 addition & 1 deletion examples/generate-pipeline/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/getting-started-kustomize/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
metadata:
name: getting-started-kustomize
Expand Down
2 changes: 1 addition & 1 deletion examples/getting-started/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 as builder
FROM golang:1.18 as builder
WORKDIR /code
COPY main.go .
COPY go.mod .
Expand Down
2 changes: 1 addition & 1 deletion examples/getting-started/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/GoogleContainerTools/skaffold/examples/getting-started

go 1.19
go 1.18
2 changes: 1 addition & 1 deletion examples/getting-started/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/google-cloud-build/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
googleCloudBuild:
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-e2e-tests/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
metadata:
name: visitor-counter-e2e
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-e2e-tests/tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/GoogleContainerTools/skaffold/v2/integration/v2/examples/grpc-e2e-tests/tests
module github.com/GoogleContainerTools/skaffold/v2/integration/examples/grpc-e2e-tests/tests

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion examples/helm-deployment-dependencies/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
tagPolicy:
Expand Down
4 changes: 2 additions & 2 deletions examples/helm-deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ deploy:
- name: skaffold-helm
chartPath: charts
# namespace: skaffold
setValues:
artifactOverrides:
image: skaffold-helm
valuesFiles:
- values.yaml
Expand All @@ -34,6 +34,6 @@ deploy:
This part tells Skaffold to set the `image` parameter of the values file to the built `skaffold-helm` image and tag.

```yaml
setValues:
artifactOverrides:
image: skaffold-helm
```
4 changes: 1 addition & 3 deletions examples/helm-deployment/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand All @@ -8,5 +8,3 @@ deploy:
releases:
- name: skaffold-helm
chartPath: charts
setValues:
image: skaffold-helm
2 changes: 1 addition & 1 deletion examples/helm-remote-repo/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
deploy:
helm:
Expand Down
2 changes: 1 addition & 1 deletion examples/helm-render/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/hot-reload/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta1
apiVersion: skaffold/v4beta2
kind: Config
build:
artifacts:
Expand Down
51 changes: 27 additions & 24 deletions examples/jib-gradle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,42 +1,45 @@
plugins {
id 'application'
id 'groovy'
id 'io.spring.dependency-management' version '1.0.6.RELEASE'
id 'net.ltgt.apt-idea' version '0.18'
id 'io.micronaut.application' version '3.6.3'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'com.google.cloud.tools.jib' version '3.3.1'
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
// the configuration was mostly generated from micronaut cli.
java {
sourceCompatibility = JavaVersion.toVersion("11")
targetCompatibility = JavaVersion.toVersion("11")
}

version '0.1'
group 'example.jib-gradle'

repositories {
mavenCentral()
maven { url 'https://jcenter.bintray.com' }
}

dependencyManagement {
imports {
mavenBom 'io.micronaut:micronaut-bom:1.0.3'
}
}

dependencies {
annotationProcessor 'io.micronaut:micronaut-inject-java'
compile 'io.micronaut:micronaut-http-client'
compile 'io.micronaut:micronaut-http-server-netty'
compile 'io.micronaut:micronaut-runtime-groovy'
compile 'io.micronaut:micronaut-inject'
compile 'io.micronaut:micronaut-runtime'
compileOnly 'io.micronaut:micronaut-inject-groovy'
compileOnly 'io.micronaut:micronaut-inject-java'
runtime 'ch.qos.logback:logback-classic:1.2.3'
implementation 'io.micronaut:micronaut-http-server-netty'
implementation 'jakarta.annotation:jakarta.annotation-api'
implementation 'io.micronaut:micronaut-inject'
implementation 'io.micronaut:micronaut-runtime'
implementation 'io.micronaut.groovy:micronaut-runtime-groovy'
runtimeOnly 'ch.qos.logback:logback-classic:1.2.3'
}

compileJava.options.compilerArgs += '-parameters'
compileTestJava.options.compilerArgs += '-parameters'
mainClassName = 'example.micronaut.Application'

jib.from.image = 'openjdk:8'
application {
mainClass.set("example.micronaut.Application")
}


micronaut {
runtime("netty")
processing {
incremental(true)
annotations("example.micronaut.*")
}
}

jib.from.image = 'openjdk:11'
1 change: 1 addition & 0 deletions examples/jib-gradle/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
micronautVersion=3.7.4
Binary file modified examples/jib-gradle/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading