kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid triggering upgrade tests on release commits

This commit is contained in:
John Gardiner Myers 2022-12-24 14:47:23 -08:00
parent 940538e04c
commit 27b8522081
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -6,7 +6,7 @@ metadata:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.26.0-beta.1 version: v{{ KopsVersion }}
spec: spec:
replicas: 1 replicas: 1
strategy: strategy:
@ -19,7 +19,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.26.0-beta.1 version: v{{ KopsVersion }}
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
affinity: affinity:
@ -47,7 +47,7 @@ spec:
nodeSelector: null nodeSelector: null
containers: containers:
- name: dns-controller - name: dns-controller
image: registry.k8s.io/kops/dns-controller:1.26.0-beta.1 image: registry.k8s.io/kops/dns-controller:{{ KopsVersion }}
args: args:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

6
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -19,7 +19,7 @@ metadata:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.26.0-beta.1 version: v{{ KopsVersion }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -31,7 +31,7 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.26.0-beta.1 version: v{{ KopsVersion }}
{{ if UseKopsControllerForNodeBootstrap }} {{ if UseKopsControllerForNodeBootstrap }}
annotations: annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
@ -67,7 +67,7 @@ spec:
serviceAccount: kops-controller serviceAccount: kops-controller
containers: containers:
- name: kops-controller - name: kops-controller
image: registry.k8s.io/kops/kops-controller:1.26.0-beta.1 image: registry.k8s.io/kops/kops-controller:{{ KopsVersion }}
volumeMounts: volumeMounts:
{{ if .UseHostCertificates }} {{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs - mountPath: /etc/ssl/certs

2
upup/pkg/fi/cloudup/template_functions.go
View File

@ -45,6 +45,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog/v2" "k8s.io/klog/v2"
kopsroot "k8s.io/kops"
kopscontrollerconfig "k8s.io/kops/cmd/kops-controller/pkg/config" kopscontrollerconfig "k8s.io/kops/cmd/kops-controller/pkg/config"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
apiModel "k8s.io/kops/pkg/apis/kops/model" apiModel "k8s.io/kops/pkg/apis/kops/model"
@ -351,6 +352,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
dest["IsKubernetesLT"] = tf.IsKubernetesLT dest["IsKubernetesLT"] = tf.IsKubernetesLT
dest["KopsFeatureEnabled"] = tf.kopsFeatureEnabled dest["KopsFeatureEnabled"] = tf.kopsFeatureEnabled
dest["KopsVersion"] = func() string { return kopsroot.KOPS_RELEASE_VERSION }
return nil return nil
} }