Skip to content

Commit

Permalink
Change the default image to docker.io/bitpoke/wordpress-runtime:5.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
calind committed Nov 22, 2021
1 parent 2680069 commit 502533c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion config/crds/wordpress.presslabs.org_wordpresses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ spec:
type: object
type: array
image:
description: WordPress runtime image to use. Defaults to quay.io/presslabs/wordpress-runtime:<latest
description: WordPress runtime image to use. Defaults to docker.io/bitpoke/wordpress-runtime:<latest
stable runtime tag>
type: string
imagePullPolicy:
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/wordpress-operator/crds/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ spec:
type: object
type: array
image:
description: WordPress runtime image to use. Defaults to quay.io/presslabs/wordpress-runtime:<latest stable runtime tag>
description: WordPress runtime image to use. Defaults to docker.io/bitpoke/wordpress-runtime:<latest stable runtime tag>
type: string
imagePullPolicy:
description: ImagePullPolicy overrides WordpressRuntime spec.imagePullPolicy
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/wordpress/v1alpha1/wordpress_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ type WordpressSpec struct {
// If no routes are specified, ingress syncing is disabled and WP_HOME de defaults to NAME.NAMESPACE.svc.
// +optional
Routes []RouteSpec `json:"routes,omitempty"`
// WordPress runtime image to use. Defaults to quay.io/presslabs/wordpress-runtime:<latest stable runtime tag>
// WordPress runtime image to use. Defaults to docker.io/bitpoke/wordpress-runtime:<latest stable runtime tag>
// +optional
Image string `json:"image,omitempty"`
// ImagePullPolicy overrides WordpressRuntime spec.imagePullPolicy
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var (
GitCloneImage = "docker.io/library/buildpack-deps:stretch-scm"

// WordpressRuntimeImage is the base image used to run your code.
WordpressRuntimeImage = "quay.io/presslabs/wordpress-runtime:5.2.2"
WordpressRuntimeImage = "docker.io/bitpoke/wordpress-runtime:5.8.2"

// IngressClass is the default ingress class used used for creating WordPress ingresses.
IngressClass = ""
Expand Down
24 changes: 12 additions & 12 deletions pkg/controller/wordpress/internal/sync/ingress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = Describe("The upsertPath function", func() {
BeforeEach(func() {
rules = []netv1beta1.IngressRule{
{
Host: "presslabs.com",
Host: "bitpoke.io",
IngressRuleValue: netv1beta1.IngressRuleValue{
HTTP: &netv1beta1.HTTPIngressRuleValue{
Paths: []netv1beta1.HTTPIngressPath{
Expand All @@ -41,17 +41,17 @@ var _ = Describe("The upsertPath function", func() {
},
},
},
{Host: "blog.presslabs.com"},
{Host: "blog.bitpoke.io"},
}
bk = netv1beta1.IngressBackend{}
})

When("upserting a new host", func() {
It("should create a new rule", func() {
Expect(upsertPath(rules, "docs.presslabs.com", "/", bk)).To(Equal(
Expect(upsertPath(rules, "docs.bitpoke.io", "/", bk)).To(Equal(
[]netv1beta1.IngressRule{
{
Host: "presslabs.com",
Host: "bitpoke.io",
IngressRuleValue: netv1beta1.IngressRuleValue{
HTTP: &netv1beta1.HTTPIngressRuleValue{
Paths: []netv1beta1.HTTPIngressPath{
Expand All @@ -60,9 +60,9 @@ var _ = Describe("The upsertPath function", func() {
},
},
},
{Host: "blog.presslabs.com"},
{Host: "blog.bitpoke.io"},
{
Host: "docs.presslabs.com",
Host: "docs.bitpoke.io",
IngressRuleValue: netv1beta1.IngressRuleValue{
HTTP: &netv1beta1.HTTPIngressRuleValue{
Paths: []netv1beta1.HTTPIngressPath{
Expand All @@ -77,10 +77,10 @@ var _ = Describe("The upsertPath function", func() {

When("upserting an existing host with a new path", func() {
It("should add the path to the existing rule", func() {
Expect(upsertPath(rules, "presslabs.com", "/blog", bk)).To(Equal(
Expect(upsertPath(rules, "bitpoke.io", "/blog", bk)).To(Equal(
[]netv1beta1.IngressRule{
{
Host: "presslabs.com",
Host: "bitpoke.io",
IngressRuleValue: netv1beta1.IngressRuleValue{
HTTP: &netv1beta1.HTTPIngressRuleValue{
Paths: []netv1beta1.HTTPIngressPath{
Expand All @@ -90,17 +90,17 @@ var _ = Describe("The upsertPath function", func() {
},
},
},
{Host: "blog.presslabs.com"},
{Host: "blog.bitpoke.io"},
}))
})
})

When("upserting an existing host with an existing path", func() {
It("should not change anything", func() {
Expect(upsertPath(rules, "presslabs.com", "/", bk)).To(Equal(
Expect(upsertPath(rules, "bitpoke.io", "/", bk)).To(Equal(
[]netv1beta1.IngressRule{
{
Host: "presslabs.com",
Host: "bitpoke.io",
IngressRuleValue: netv1beta1.IngressRuleValue{
HTTP: &netv1beta1.HTTPIngressRuleValue{
Paths: []netv1beta1.HTTPIngressPath{
Expand All @@ -109,7 +109,7 @@ var _ = Describe("The upsertPath function", func() {
},
},
},
{Host: "blog.presslabs.com"},
{Host: "blog.bitpoke.io"},
}))

})
Expand Down

0 comments on commit 502533c

Please sign in to comment.