Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cert-manager/cert-manager
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.11.1
Choose a base ref
...
head repository: cert-manager/cert-manager
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.11.2
Choose a head ref
  • 11 commits
  • 10 files changed
  • 3 contributors

Commits on Apr 13, 2023

  1. add go workspace files to gitignore

    this aids with switching branches between master / release-1.11
    
    Signed-off-by: Ashley Davis <ashley.davis@jetstack.io>
    SgtCoDFish committed Apr 13, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    SgtCoDFish Ashley Davis
    Copy the full SHA
    9e72e52 View commit details
  2. [release-1.11] add gcb configuration file for building cert-manager w…

    …hen tag pushed
    
    After a GCB trigger is configured, this configuration file will enable
    cert-manager releases to automatically be built when a new tag is
    pushed.
    
    This has been tested on a fork and confirmed to work.
    
    Signed-off-by: Ashley Davis <ashley.davis@jetstack.io>
    SgtCoDFish committed Apr 13, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    SgtCoDFish Ashley Davis
    Copy the full SHA
    37a31b5 View commit details
  3. Merge pull request #5945 from SgtCoDFish/release-1.11-autobuild

    [release-1.11] Autobuild on tag push
    jetstack-bot authored Apr 13, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c21abee View commit details

Commits on Apr 25, 2023

  1. Adds kube 1.27 kind image

    Signed-off-by: irbekrm <irbekrm@gmail.com>
    irbekrm committed Apr 25, 2023
    Copy the full SHA
    9944336 View commit details
  2. Merge pull request #5984 from irbekrm/add_kube_127

    Adds kube 1.27 kind image
    jetstack-bot authored Apr 25, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    40d1aaf View commit details

Commits on May 3, 2023

  1. [release-1.11] Bump go and base images to latest

    Signed-off-by: Ashley Davis <ashley.davis@jetstack.io>
    SgtCoDFish committed May 3, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    SgtCoDFish Ashley Davis
    Copy the full SHA
    3ef1f83 View commit details
  2. Merge pull request #6014 from SgtCoDFish/release-1.11-bumpgo

    [release-1.11] Bump go and base images to latest
    jetstack-bot authored May 3, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    acadab3 View commit details

Commits on May 9, 2023

  1. Bump Docker

    To fix trivy vulns
    
    Signed-off-by: irbekrm <irbekrm@gmail.com>
    irbekrm committed May 9, 2023
    Copy the full SHA
    d99aa54 View commit details
  2. Bump kube libs

    Bumps kube libs to latest patch release
    
    Signed-off-by: irbekrm <irbekrm@gmail.com>
    irbekrm committed May 9, 2023
    Copy the full SHA
    30e8cfc View commit details
  3. Merge pull request #6038 from irbekrm/bump_kube_libs

    Bump release-1.11 kube libs to latest patch version
    jetstack-bot authored May 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    876d6e2 View commit details
  4. Merge pull request #6037 from irbekrm/fix_1_11_vulns

    Fix release-1.11 trivy vulns
    jetstack-bot authored May 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4767427 View commit details
Showing with 138 additions and 76 deletions.
  1. +2 −0 .gitignore
  2. +17 −17 LICENSES
  3. +37 −0 gcb/build_cert_manager.yaml
  4. +16 −16 go.mod
  5. +32 −32 go.sum
  6. +13 −0 hack/latest-kind-images.sh
  7. +10 −10 make/base_images.mk
  8. +1 −0 make/cluster.sh
  9. +9 −0 make/kind_images.sh
  10. +1 −1 make/tools.mk
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -18,3 +18,5 @@ _bin/
.bin/
user.bazelrc
*.bak
/go.work.sum
/go.work
34 changes: 17 additions & 17 deletions LICENSES
Original file line number Diff line number Diff line change
@@ -44,9 +44,9 @@ github.com/cpuguy83/go-md2man/v2/md2man,https://github.com/cpuguy83/go-md2man/bl
github.com/cyphar/filepath-securejoin,https://github.com/cyphar/filepath-securejoin/blob/v0.2.3/LICENSE,BSD-3-Clause
github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/v1.1.1/LICENSE,ISC
github.com/digitalocean/godo,https://github.com/digitalocean/godo/blob/v1.86.0/LICENSE.txt,MIT
github.com/docker/cli/cli/config,https://github.com/docker/cli/blob/v20.10.21/LICENSE,Apache-2.0
github.com/docker/cli/cli/config,https://github.com/docker/cli/blob/v20.10.24/LICENSE,Apache-2.0
github.com/docker/distribution,https://github.com/docker/distribution/blob/v2.8.1/LICENSE,Apache-2.0
github.com/docker/docker,https://github.com/docker/docker/blob/v20.10.21/LICENSE,Apache-2.0
github.com/docker/docker,https://github.com/docker/docker/blob/v20.10.24/LICENSE,Apache-2.0
github.com/docker/docker-credential-helpers,https://github.com/docker/docker-credential-helpers/blob/v0.7.0/LICENSE,MIT
github.com/docker/go-connections,https://github.com/docker/go-connections/blob/v0.4.0/LICENSE,Apache-2.0
github.com/docker/go-metrics,https://github.com/docker/go-metrics/blob/v0.0.1/LICENSE,Apache-2.0
@@ -75,7 +75,7 @@ github.com/golang/groupcache/lru,https://github.com/golang/groupcache/blob/41bb1
github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.2/LICENSE,BSD-3-Clause
github.com/golang/snappy,https://github.com/golang/snappy/blob/v0.0.4/LICENSE,BSD-3-Clause
github.com/google/btree,https://github.com/google/btree/blob/v1.0.1/LICENSE,Apache-2.0
github.com/google/cel-go,https://github.com/google/cel-go/blob/v0.12.5/LICENSE,Apache-2.0
github.com/google/cel-go,https://github.com/google/cel-go/blob/v0.12.6/LICENSE,Apache-2.0
github.com/google/gnostic,https://github.com/google/gnostic/blob/v0.6.9/LICENSE,Apache-2.0
github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.5.9/LICENSE,BSD-3-Clause
github.com/google/go-querystring/query,https://github.com/google/go-querystring/blob/v1.1.0/LICENSE,BSD-3-Clause
@@ -217,27 +217,27 @@ gopkg.in/square/go-jose.v2/json,https://github.com/square/go-jose/blob/v2.5.1/js
gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0
gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE,MIT
helm.sh/helm/v3,https://github.com/helm/helm/blob/v3.11.1/LICENSE,Apache-2.0
k8s.io/api,https://github.com/kubernetes/api/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/apiextensions-apiserver/pkg,https://github.com/kubernetes/apiextensions-apiserver/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/apimachinery/pkg,https://github.com/kubernetes/apimachinery/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/apimachinery/third_party/forked/golang,https://github.com/kubernetes/apimachinery/blob/v0.26.0/third_party/forked/golang/LICENSE,BSD-3-Clause
k8s.io/apiserver,https://github.com/kubernetes/apiserver/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/cli-runtime/pkg,https://github.com/kubernetes/cli-runtime/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/client-go,https://github.com/kubernetes/client-go/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/client-go/third_party/forked/golang/template,https://github.com/kubernetes/client-go/blob/v0.26.0/third_party/forked/golang/LICENSE,BSD-3-Clause
k8s.io/component-base,https://github.com/kubernetes/component-base/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/api,https://github.com/kubernetes/api/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/apiextensions-apiserver/pkg,https://github.com/kubernetes/apiextensions-apiserver/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/apimachinery/pkg,https://github.com/kubernetes/apimachinery/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/apimachinery/third_party/forked/golang,https://github.com/kubernetes/apimachinery/blob/v0.26.4/third_party/forked/golang/LICENSE,BSD-3-Clause
k8s.io/apiserver,https://github.com/kubernetes/apiserver/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/cli-runtime/pkg,https://github.com/kubernetes/cli-runtime/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/client-go,https://github.com/kubernetes/client-go/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/client-go/third_party/forked/golang/template,https://github.com/kubernetes/client-go/blob/v0.26.4/third_party/forked/golang/LICENSE,BSD-3-Clause
k8s.io/component-base,https://github.com/kubernetes/component-base/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/klog/v2,https://github.com/kubernetes/klog/blob/v2.80.1/LICENSE,Apache-2.0
k8s.io/kms/apis,https://github.com/kubernetes/kms/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/kube-aggregator/pkg/apis/apiregistration,https://github.com/kubernetes/kube-aggregator/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/kms/apis,https://github.com/kubernetes/kms/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/kube-aggregator/pkg/apis/apiregistration,https://github.com/kubernetes/kube-aggregator/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/kube-openapi/pkg,https://github.com/kubernetes/kube-openapi/blob/f3cff1453715/LICENSE,Apache-2.0
k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json,https://github.com/kubernetes/kube-openapi/blob/f3cff1453715/pkg/internal/third_party/go-json-experiment/json/LICENSE,BSD-3-Clause
k8s.io/kube-openapi/pkg/validation/spec,https://github.com/kubernetes/kube-openapi/blob/f3cff1453715/pkg/validation/spec/LICENSE,Apache-2.0
k8s.io/kubectl/pkg,https://github.com/kubernetes/kubectl/blob/v0.26.0/LICENSE,Apache-2.0
k8s.io/kubectl/pkg,https://github.com/kubernetes/kubectl/blob/v0.26.4/LICENSE,Apache-2.0
k8s.io/utils,https://github.com/kubernetes/utils/blob/99ec85e7a448/LICENSE,Apache-2.0
k8s.io/utils/internal/third_party/forked/golang,https://github.com/kubernetes/utils/blob/99ec85e7a448/internal/third_party/forked/golang/LICENSE,BSD-3-Clause
oras.land/oras-go/pkg,https://github.com/oras-project/oras-go/blob/v1.2.2/LICENSE,Apache-2.0
sigs.k8s.io/apiserver-network-proxy/konnectivity-client,https://github.com/kubernetes-sigs/apiserver-network-proxy/blob/konnectivity-client/v0.0.33/konnectivity-client/LICENSE,Apache-2.0
sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.14.1/LICENSE,Apache-2.0
sigs.k8s.io/apiserver-network-proxy/konnectivity-client,https://github.com/kubernetes-sigs/apiserver-network-proxy/blob/konnectivity-client/v0.0.36/konnectivity-client/LICENSE,Apache-2.0
sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.14.6/LICENSE,Apache-2.0
sigs.k8s.io/gateway-api,https://github.com/kubernetes-sigs/gateway-api/blob/v0.6.0/LICENSE,Apache-2.0
sigs.k8s.io/json,https://github.com/kubernetes-sigs/json/blob/f223a00ba0e2/LICENSE,Apache-2.0
sigs.k8s.io/kustomize/api,https://github.com/kubernetes-sigs/kustomize/blob/api/v0.12.1/api/LICENSE,Apache-2.0
37 changes: 37 additions & 0 deletions gcb/build_cert_manager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This cloudbuild config file is intended to be triggered when a tag is pushed to the cert-manager repo
# and will build a cert-manager release and push to Google Cloud Storage (GCS).

# The release won't be published automatically; this file just defines the build steps.

# The full release and publish process is documented here:
# https://cert-manager.io/docs/contributing/release-process/

timeout: 2700s # 45m

steps:
# cert-manager relies on the git checkout to determine release version, among other things
# By default, gcb only does a shallow clone, so we need to "unshallow" to get more details
- name: gcr.io/cloud-builders/git
args: ['fetch', '--unshallow']

## Build release artifacts and push to a bucket
- name: 'eu.gcr.io/jetstack-build-infra-images/make-dind:20230406-0ef4440-bullseye'
entrypoint: bash
args:
- -c
- |
set -eu -o pipefail
make vendor-go
make CMREL_KEY="${_KMS_KEY}" RELEASE_TARGET_BUCKET="${_RELEASE_TARGET_BUCKET}" -j16 upload-release
echo "Wrote to ${_RELEASE_TARGET_BUCKET}"
tags:
- "cert-manager-tag-push"
- "ref-${REF_NAME}-${COMMIT_SHA}"

substitutions:
_KMS_KEY: "projects/cert-manager-release/locations/europe-west1/keyRings/cert-manager-release/cryptoKeys/cert-manager-release-signing-key/cryptoKeyVersions/1"
_RELEASE_TARGET_BUCKET: "cert-manager-release"

options:
machineType: N1_HIGHCPU_32
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -39,20 +39,20 @@ require (
gomodules.xyz/jsonpatch/v2 v2.2.0
google.golang.org/api v0.103.0
helm.sh/helm/v3 v3.11.1
k8s.io/api v0.26.0
k8s.io/apiextensions-apiserver v0.26.0
k8s.io/apimachinery v0.26.0
k8s.io/apiserver v0.26.0
k8s.io/cli-runtime v0.26.0
k8s.io/client-go v0.26.0
k8s.io/code-generator v0.26.0
k8s.io/component-base v0.26.0
k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery v0.26.4
k8s.io/apiserver v0.26.4
k8s.io/cli-runtime v0.26.4
k8s.io/client-go v0.26.4
k8s.io/code-generator v0.26.4
k8s.io/component-base v0.26.4
k8s.io/klog/v2 v2.80.1
k8s.io/kube-aggregator v0.26.0
k8s.io/kube-aggregator v0.26.4
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715
k8s.io/kubectl v0.26.0
k8s.io/kubectl v0.26.4
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.1
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/controller-tools v0.11.1
sigs.k8s.io/gateway-api v0.6.0
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
@@ -95,9 +95,9 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.21+incompatible // indirect
github.com/docker/cli v20.10.24+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.21+incompatible // indirect
github.com/docker/docker v20.10.24+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
@@ -126,7 +126,7 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/cel-go v0.12.5 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
@@ -250,9 +250,9 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kms v0.26.0 // indirect
k8s.io/kms v0.26.4 // indirect
oras.land/oras-go v1.2.2 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
Loading