Skip to content

Commit

Permalink
Revert "add apiVersion and kind to docs and examples" (kubernetes-sig…
Browse files Browse the repository at this point in the history
  • Loading branch information
Liujingfang1 authored Dec 20, 2018
1 parent 4b25963 commit 6f566d7
Show file tree
Hide file tree
Showing 26 changed files with 1 addition and 75 deletions.
4 changes: 0 additions & 4 deletions docs/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
# visible in configuration reviews.
# ----------------------------------------------------

# apiVersion and Kind for current kustomization.yaml
apiVersion: v1
kind: Kustomization

# Adds namespace to all resources.
namespace: my-namespace

Expand Down
6 changes: 0 additions & 6 deletions examples/breakfast.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ breakfast. This breakfast has coffee and pancakes:
<!-- @baseKustomization @test -->
```
cat <<EOF >$DEMO_HOME/breakfast/base/kustomization.yaml
apiVersion: v1
kind: Kustomization
resources:
- coffee.yaml
- pancakes.yaml
Expand Down Expand Up @@ -71,8 +69,6 @@ likes her coffee hot:
mkdir -p $DEMO_HOME/breakfast/overlays/alice
cat <<EOF >$DEMO_HOME/breakfast/overlays/alice/kustomization.yaml
apiVersion: v1
kind: Kustomization
commonLabels:
who: alice
bases:
Expand All @@ -96,8 +92,6 @@ And likewise a [variant] for Bob, who wants _five_ pancakes, with strawberries:
mkdir -p $DEMO_HOME/breakfast/overlays/bob
cat <<EOF >$DEMO_HOME/breakfast/overlays/bob/kustomization.yaml
apiVersion: v1
kind: Kustomization
commonLabels:
who: bob
bases:
Expand Down
6 changes: 0 additions & 6 deletions examples/combineConfigs.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ height=10m
EOF
cat <<EOF >$DEMO_HOME/base/kustomization.yaml
apiVersion: v1
kind: Kustomization
configMapGenerator:
- name: my-configmap
files:
Expand Down Expand Up @@ -193,8 +191,6 @@ dbpassword=mothersMaidenName
EOF
cat <<EOF >$OVERLAYS/development/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- ../../base
namePrefix: dev-
Expand Down Expand Up @@ -277,8 +273,6 @@ dbpassword=thisShouldProbablyBeInASecretInstead
EOF

cat <<EOF >$OVERLAYS/production/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- ../../base
namePrefix: prod-
Expand Down
4 changes: 0 additions & 4 deletions examples/configGeneration.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ curl -s -o "$BASE/#1.yaml" "https://raw.githubusercontent.com\
/{deployment,service}.yaml"

cat <<'EOF' >$BASE/kustomization.yaml
apiVersion: v1
kind: Kustomization
commonLabels:
app: hello
resources:
Expand All @@ -61,8 +59,6 @@ OVERLAYS=$DEMO_HOME/overlays
mkdir -p $OVERLAYS/staging

cat <<'EOF' >$OVERLAYS/staging/kustomization.yaml
apiVersion: v1
kind: Kustomization
namePrefix: staging-
nameSuffix: -v1
commonLabels:
Expand Down
2 changes: 0 additions & 2 deletions examples/generatorOptions.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ Create a kustomization and add a ConfigMap generator to it.
<!-- @createCMGenerator @test -->
```
cat > $DEMO_HOME/kustomization.yaml << EOF
apiVersion: v1
kind: Kustomization
configMapGenerator:
- name: my-configmap
literals:
Expand Down
4 changes: 0 additions & 4 deletions examples/helloWorld/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ defining a new name prefix, and some different labels.
<!-- @makeStagingKustomization @test -->
```
cat <<'EOF' >$OVERLAYS/staging/kustomization.yaml
apiVersion: v1
kind: Kustomization
namePrefix: staging-
commonLabels:
variant: staging
Expand Down Expand Up @@ -185,8 +183,6 @@ with a different name prefix and labels.
<!-- @makeProductionKustomization @test -->
```
cat <<EOF >$OVERLAYS/production/kustomization.yaml
apiVersion: v1
kind: Kustomization
namePrefix: production-
commonLabels:
variant: production
Expand Down
2 changes: 0 additions & 2 deletions examples/helloWorld/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Example configuration for the webserver
# at https://github.com/monopole/hello
apiVersion: v1
kind: Kustomization
commonLabels:
app: hello

Expand Down
2 changes: 0 additions & 2 deletions examples/imageTags.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Make a `kustomization` containing a pod resource
<!-- @createKustomization @test -->
```
cat <<EOF >$DEMO_HOME/kustomization.yaml
apiVersion: v1
kind: Kustomization
resources:
- pod.yaml
EOF
Expand Down
2 changes: 0 additions & 2 deletions examples/jsonpatch.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ Make a `kustomization` containing an ingress resource.
DEMO_HOME=$(mktemp -d)
cat <<EOF >$DEMO_HOME/kustomization.yaml
apiVersion: v1
kind: Kustomization
resources:
- ingress.yaml
EOF
Expand Down
2 changes: 0 additions & 2 deletions examples/ldap/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
resources:
- deployment.yaml
- service.yaml
Expand Down
2 changes: 0 additions & 2 deletions examples/ldap/overlays/production/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ../../base
patchesStrategicMerge:
Expand Down
2 changes: 0 additions & 2 deletions examples/ldap/overlays/staging/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ../../base
patchesStrategicMerge:
Expand Down
10 changes: 0 additions & 10 deletions examples/multibases/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ BASE=$DEMO_HOME/base
mkdir $BASE
cat <<EOF >$BASE/kustomization.yaml
apiVersion: v1
kind: Kustomization
resources:
- pod.yaml
EOF
Expand All @@ -49,8 +47,6 @@ DEV=$DEMO_HOME/dev
mkdir $DEV
cat <<EOF >$DEV/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- ./../base
namePrefix: dev-
Expand All @@ -64,8 +60,6 @@ STAG=$DEMO_HOME/staging
mkdir $STAG
cat <<EOF >$STAG/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- ./../base
namePrefix: stag-
Expand All @@ -79,8 +73,6 @@ PROD=$DEMO_HOME/production
mkdir $PROD
cat <<EOF >$PROD/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- ./../base
namePrefix: prod-
Expand All @@ -91,8 +83,6 @@ Then define a _Kustomization_ composing three variants together:
<!-- @makeTopLayer @test -->
```
cat <<EOF >$DEMO_HOME/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- ./dev
- ./staging
Expand Down
4 changes: 1 addition & 3 deletions examples/multibases/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
apiVersion: v1
kind: Kustomization
resources:
- pod.yaml
- pod.yaml
2 changes: 0 additions & 2 deletions examples/multibases/dev/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ./../base

Expand Down
2 changes: 0 additions & 2 deletions examples/multibases/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ./dev
- ./staging
Expand Down
2 changes: 0 additions & 2 deletions examples/multibases/production/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ./../base

Expand Down
2 changes: 0 additions & 2 deletions examples/multibases/staging/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ./../base

Expand Down
2 changes: 0 additions & 2 deletions examples/remoteBuild.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ A base can also be specified as a URL:
DEMO_HOME=$(mktemp -d)
cat <<EOF >$DEMO_HOME/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- github.com/kubernetes-sigs/kustomize//examples/multibases?ref=v1.0.6
namePrefix: remote-
Expand Down
2 changes: 0 additions & 2 deletions examples/springboot/overlays/production/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ../../base
patchesStrategicMerge:
Expand Down
2 changes: 0 additions & 2 deletions examples/springboot/overlays/staging/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- ../../base
namePrefix: staging-
Expand Down
2 changes: 0 additions & 2 deletions examples/transformerconfigs/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
resources:
- resources.yaml

Expand Down
2 changes: 0 additions & 2 deletions examples/wordpress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ Create a new kustomization with two bases:
<!-- @createKustomization @test -->
```
cat <<EOF >$DEMO_HOME/kustomization.yaml
apiVersion: v1
kind: Kustomization
bases:
- wordpress
- mysql
Expand Down
2 changes: 0 additions & 2 deletions examples/wordpress/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
bases:
- wordpress
- mysql
Expand Down
2 changes: 0 additions & 2 deletions examples/wordpress/mysql/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
resources:
- deployment.yaml
- service.yaml
Expand Down
2 changes: 0 additions & 2 deletions examples/wordpress/wordpress/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apiVersion: v1
kind: Kustomization
resources:
- deployment.yaml
- service.yaml

0 comments on commit 6f566d7

Please sign in to comment.