Skip to content

Commit a694303

Browse files
mazdaknmazdakn
committed
Merge branch 'master' into felix-ipip
2 parents 22a5611 + 4b416f3 commit a694303

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1417
-451
lines changed

‎.semaphore/release/release.yml

+44-16
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ execution_time_limit:
1010

1111
blocks:
1212
- name: "Publish official release"
13+
dependencies: []
1314
skip:
1415
# Only run on branches, not PRs.
1516
when: "branch !~ '.+'"
1617
task:
1718
secrets:
18-
- name: quay-robot-calico+semaphoreci
19-
- name: docker
20-
- name: oss-release-secrets
21-
- name: google-service-account-for-gce
22-
- name: openstack-signing-publishing
19+
- name: quay-robot-calico+semaphoreci
20+
- name: docker
21+
- name: oss-release-secrets
22+
- name: google-service-account-for-gce
23+
- name: openstack-signing-publishing
2324
prologue:
2425
commands:
2526
# Load the github access secrets. First fix the permissions.
@@ -68,17 +69,44 @@ blocks:
6869
commands:
6970
- if [ -z "${SEMAPHORE_GIT_PR_NUMBER}" ]; then make GIT_BRANCH=${SEMAPHORE_GIT_BRANCH} release; fi
7071
- if [ -z "${SEMAPHORE_GIT_PR_NUMBER}" ]; then make GIT_BRANCH=${SEMAPHORE_GIT_BRANCH} release-publish; fi
71-
- name: "Build Openstack Packages"
72-
execution_time_limit:
73-
minutes: 60
74-
env_vars:
75-
- name: SECRET_KEY
76-
value: /home/semaphore/secrets/launchpad-gpg-key-dfox.key
77-
- name: GCLOUD_ARGS
78-
value: --zone us-east1-c --project tigera-wp-tcp-redirect
79-
- name: HOST
80-
value: ubuntu@binaries-projectcalico-org
72+
- name: "Build Openstack Packages"
73+
dependencies: ["Publish official release"]
74+
skip:
75+
when: "branch !~ '.+'"
76+
task:
77+
secrets:
78+
- name: quay-robot-calico+semaphoreci
79+
- name: docker
80+
- name: oss-release-secrets
81+
- name: google-service-account-for-gce
82+
- name: openstack-signing-publishing
83+
prologue:
8184
commands:
85+
# Load the github access secrets. First fix the permissions.
86+
- chmod 0600 /home/semaphore/.keys/git_ssh_rsa
87+
- ssh-add /home/semaphore/.keys/git_ssh_rsa
88+
# Checkout the code and unshallow it.
89+
- checkout
90+
# Free up space on the build machine.
91+
- sudo rm -rf ~/.kiex ~/.phpbrew ~/.rbenv ~/.nvm ~/.kerl ~/.sbt ~/.npm /usr/lib/jvm /opt/firefox* /opt/apache-maven* /opt/scala /usr/local/golang
92+
# Install more tools
8293
- sudo apt update
8394
- sudo apt install -y moreutils patchelf
84-
- make publish-openstack
95+
jobs:
96+
- name: "Build Openstack Packages"
97+
execution_time_limit:
98+
minutes: 60
99+
env_vars:
100+
- name: SECRET_KEY
101+
value: /home/semaphore/secrets/launchpad-gpg-key-dfox.key
102+
- name: GCLOUD_ARGS
103+
value: --zone us-east1-c --project tigera-wp-tcp-redirect
104+
- name: HOST
105+
value: ubuntu@binaries-projectcalico-org
106+
commands:
107+
- if [ -z "${SEMAPHORE_GIT_PR_NUMBER}" ]; then make publish-openstack; fi
108+
epilogue:
109+
always:
110+
commands:
111+
- test -d hack/release/packaging/output && mv -v hack/release/packaging/output hack/release/packaging/openstack
112+
- artifact push workflow hack/release/packaging/openstack

‎.semaphore/semaphore-scheduled-builds.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ blocks:
238238
jobs:
239239
- name: Containerd - Windows FV
240240
execution_time_limit:
241-
minutes: 60
241+
minutes: 120
242242
commands:
243243
- ../.semaphore/run-and-monitor win-fv-containerd.log ./.semaphore/run-win-fv.sh
244244
env_vars:

‎.semaphore/semaphore.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ blocks:
238238
jobs:
239239
- name: Containerd - Windows FV
240240
execution_time_limit:
241-
minutes: 60
241+
minutes: 120
242242
commands:
243243
- ../.semaphore/run-and-monitor win-fv-containerd.log ./.semaphore/run-win-fv.sh
244244
env_vars:

‎.semaphore/semaphore.yml.d/blocks/20-cni-plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
jobs:
6262
- name: Containerd - Windows FV
6363
execution_time_limit:
64-
minutes: 60
64+
minutes: 120
6565
commands:
6666
- ../.semaphore/run-and-monitor win-fv-containerd.log ./.semaphore/run-win-fv.sh
6767
env_vars:

‎api/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/go-openapi/jsonreference v0.20.1 // indirect
2222
github.com/go-openapi/swag v0.22.3 // indirect
2323
github.com/gogo/protobuf v1.3.2 // indirect
24-
github.com/golang/protobuf v1.5.3 // indirect
24+
github.com/golang/protobuf v1.5.4 // indirect
2525
github.com/google/gnostic v0.5.7-v3refs // indirect
2626
github.com/google/go-cmp v0.6.0 // indirect
2727
github.com/google/gofuzz v1.2.0 // indirect
@@ -42,7 +42,7 @@ require (
4242
golang.org/x/text v0.14.0 // indirect
4343
golang.org/x/time v0.3.0 // indirect
4444
google.golang.org/appengine v1.6.7 // indirect
45-
google.golang.org/protobuf v1.31.0 // indirect
45+
google.golang.org/protobuf v1.33.0 // indirect
4646
gopkg.in/inf.v0 v0.9.1 // indirect
4747
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
4848
gopkg.in/yaml.v2 v2.4.0 // indirect

‎api/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
4444
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
4545
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
4646
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
47-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
48-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
47+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
48+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
4949
github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
5050
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
5151
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -210,8 +210,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
210210
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
211211
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
212212
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
213-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
214-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
213+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
214+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
215215
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
216216
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
217217
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎charts/calico/templates/calico-etcd-secrets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if eq .Values.datastore "etcd" -}}
22
# The following contains k8s Secrets for use with a TLS enabled etcd cluster.
3-
# For information on populating Secrets, see http://kubernetes.io/docs/user-guide/secrets/
3+
# For information on populating Secrets, see https://kubernetes.io/docs/concepts/configuration/secret/
44
apiVersion: v1
55
kind: Secret
66
type: Opaque

‎charts/calico/templates/calico-node-rbac.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ rules:
219219

220220
{{- if eq .Values.network "flannel" }}
221221
# Flannel ClusterRole
222-
# Pulled from https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel-rbac.yml
222+
# Pulled from https://github.com/flannel-io/flannel/blob/master/Documentation/k8s-old-manifests/kube-flannel-rbac.yml
223223
kind: ClusterRole
224224
apiVersion: rbac.authorization.k8s.io/v1
225225
metadata:

‎charts/tigera-operator/crds/operator.tigera.io_apiservers_crd.yaml

+17-9
Original file line numberDiff line numberDiff line change
@@ -1157,8 +1157,9 @@ spec:
11571157
API server Deployment container.
11581158
properties:
11591159
name:
1160-
description: Name is an enum which identifies
1160+
description: 'Name is an enum which identifies
11611161
the API server Deployment container by name.
1162+
Supported values are: calico-apiserver, tigera-queryserver'
11621163
enum:
11631164
- calico-apiserver
11641165
- tigera-queryserver
@@ -1223,7 +1224,8 @@ spec:
12231224
If Requests is omitted for a container,
12241225
it defaults to Limits if that is explicitly
12251226
specified, otherwise to an implementation-defined
1226-
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1227+
value. Requests cannot exceed Limits.
1228+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
12271229
type: object
12281230
type: object
12291231
required:
@@ -1241,9 +1243,9 @@ spec:
12411243
an API server Deployment init container.
12421244
properties:
12431245
name:
1244-
description: Name is an enum which identifies
1246+
description: 'Name is an enum which identifies
12451247
the API server Deployment init container by
1246-
name.
1248+
name. Supported values are: calico-apiserver-certs-key-cert-provisioner'
12471249
enum:
12481250
- calico-apiserver-certs-key-cert-provisioner
12491251
type: string
@@ -1305,7 +1307,8 @@ spec:
13051307
If Requests is omitted for a container,
13061308
it defaults to Limits if that is explicitly
13071309
specified, otherwise to an implementation-defined
1308-
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1310+
value. Requests cannot exceed Limits.
1311+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
13091312
type: object
13101313
type: object
13111314
required:
@@ -1449,16 +1452,21 @@ spec:
14491452
type: object
14501453
x-kubernetes-map-type: atomic
14511454
matchLabelKeys:
1452-
description: MatchLabelKeys is a set of pod
1455+
description: "MatchLabelKeys is a set of pod
14531456
label keys to select the pods over which spreading
14541457
will be calculated. The keys are used to lookup
14551458
values from the incoming pod labels, those
14561459
key-value labels are ANDed with labelSelector
14571460
to select the group of existing pods over
14581461
which spreading will be calculated for the
1459-
incoming pod. Keys that don't exist in the
1460-
incoming pod labels will be ignored. A null
1461-
or empty list means only match against labelSelector.
1462+
incoming pod. The same key is forbidden to
1463+
exist in both MatchLabelKeys and LabelSelector.
1464+
MatchLabelKeys cannot be set when LabelSelector
1465+
isn't set. Keys that don't exist in the incoming
1466+
pod labels will be ignored. A null or empty
1467+
list means only match against labelSelector.
1468+
\n This is a beta field and requires the MatchLabelKeysInPodTopologySpread
1469+
feature gate to be enabled (enabled by default)."
14621470
items:
14631471
type: string
14641472
type: array

0 commit comments

Comments
 (0)