Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
Change all image definitions to fluxcd org (#2224)
Browse files Browse the repository at this point in the history
Change all image definitions to `fluxcd` org
  • Loading branch information
hiddeco authored and squaremo committed Jul 25, 2019
1 parent 9d0cce3 commit d9c9b03
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion api/v9/change_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

func TestChangeEncoding(t *testing.T) {
ref, _ := image.ParseRef("docker.io/weaveworks/flux")
ref, _ := image.ParseRef("docker.io/fluxcd/flux")
name := ref.Name

for _, update := range []Change{
Expand Down
4 changes: 2 additions & 2 deletions chart/flux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a

| Parameter | Default | Description
| ----------------------------------------------- | ---------------------------------------------------- | ---
| `image.repository` | `docker.io/weaveworks/flux` | Image repository
| `image.repository` | `docker.io/fluxcd/flux` | Image repository
| `image.tag` | `<VERSION>` | Image tag
| `replicaCount` | `1` | Number of Flux pods to deploy, more than one is not desirable.
| `image.pullPolicy` | `IfNotPresent` | Image pull policy
Expand Down Expand Up @@ -251,7 +251,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a
| `memcached.securityContext` | [See values.yaml](/chart/flux/values.yaml#L192-L195) | Container security context for memcached
| `helmOperator.create` | `false` | If `true`, install the Helm operator
| `helmOperator.createCRD` | `true` | Create the `v1beta1` and `v1alpha2` Flux CRDs. Dependent on `helmOperator.create=true`
| `helmOperator.repository` | `docker.io/weaveworks/helm-operator` | Helm operator image repository
| `helmOperator.repository` | `docker.io/fluxcd/helm-operator` | Helm operator image repository
| `helmOperator.tag` | `<VERSION>` | Helm operator image tag
| `helmOperator.replicaCount` | `1` | Number of helm operator pods to deploy, more than one is not desirable.
| `helmOperator.pullPolicy` | `IfNotPresent` | Helm operator image pull policy
Expand Down
6 changes: 3 additions & 3 deletions chart/flux/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replicaCount: 1
logFormat: fmt

image:
repository: docker.io/weaveworks/flux
repository: docker.io/fluxcd/flux
tag: 1.13.2
pullPolicy: IfNotPresent
pullSecret:
Expand All @@ -21,8 +21,8 @@ helmOperator:
replicaCount: 1
create: false
createCRD: true
repository: docker.io/weaveworks/helm-operator
tag: 0.9.1
repository: docker.io/fluxcd/helm-operator
tag: 0.10.0
pullPolicy: IfNotPresent
pullSecret:
# Limit the operator scope to a single namespace
Expand Down
2 changes: 1 addition & 1 deletion deploy-helm/helm-operator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
# There are no ":latest" images for helm-operator. Find the most recent
# release or image version at https://hub.docker.com/r/weaveworks/helm-operator/tags
# and replace the tag here.
image: docker.io/weaveworks/helm-operator:0.9.1
image: docker.io/fluxcd/helm-operator:0.9.1
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion deploy-helm/weave-cloud-helm-operator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secretName: flux-git-deploy
containers:
- name: flux-helm-operator
image: docker.io/weaveworks/helm-operator:0.9.1
image: docker.io/fluxcd/helm-operator:0.9.1
imagePullPolicy: IfNotPresent
args:
- --git-timeout=20s
Expand Down
2 changes: 1 addition & 1 deletion deploy/flux-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
# There are no ":latest" images for flux. Find the most recent
# release or image version at https://hub.docker.com/r/weaveworks/flux/tags
# and replace the tag here.
image: docker.io/weaveworks/flux:1.13.2
image: docker.io/fluxcd/flux:1.13.2
imagePullPolicy: IfNotPresent
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions image/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var (
// Examples (stringified):
// * alpine
// * library/alpine
// * docker.io/weaveworks/flux
// * docker.io/fluxcd/flux
// * localhost:5000/arbitrary/path/to/repo
type Name struct {
Domain, Image string
Expand Down Expand Up @@ -107,7 +107,7 @@ func (i Name) ToRef(tag string) Ref {
// Examples (stringified):
// * alpine:3.5
// * library/alpine:3.5
// * docker.io/weaveworks/flux:1.1.0
// * docker.io/fluxcd/flux:1.1.0
// * localhost:5000/arbitrary/path/to/repo:revision-sha1
type Ref struct {
Name
Expand Down
2 changes: 1 addition & 1 deletion registry/cache/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (l TimestampLabelWhitelist) apply(r *ImageRepository) {
}

// GetImageRepositoryMetadata returns the metadata from an image
// repository (e.g,. at "docker.io/weaveworks/flux")
// repository (e.g,. at "docker.io/fluxcd/flux")
func (c *Cache) GetImageRepositoryMetadata(id image.Name) (image.RepositoryMetadata, error) {
repoKey := NewRepositoryKey(id.CanonicalName())
bytes, _, err := c.Reader.GetKey(repoKey)
Expand Down
2 changes: 1 addition & 1 deletion registry/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (entry *ImageEntry) UnmarshalJSON(bytes []byte) error {
}

// Client is a remote registry client for a particular image
// repository (e.g., for docker.io/weaveworks/flux). It is an interface
// repository (e.g., for docker.io/fluxcd/flux). It is an interface
// so we can wrap it in instrumentation, write fake implementations,
// and so on.
type Client interface {
Expand Down
4 changes: 2 additions & 2 deletions registry/imageentry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
assert.Equal(t, entry, entry2)
}

ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
assert.NoError(t, err)

info := image.Info{
Expand All @@ -44,7 +44,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
// Check that existing entries, which are image.Info, will parse into
// the ImageEntry struct.
func TestImageInfoParsesAsEntry(t *testing.T) {
ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
assert.NoError(t, err)
info := image.Info{
ID: ref,
Expand Down
18 changes: 9 additions & 9 deletions site/get-started-developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This guide shows a workflow for making a small (actually, tiny) change to Flux,
> From a very high level, there are at least 3 ways you can develop on Flux once you have your environment set up:
> 1. The "minimalist" approach (only requires and `kubectl`):
> 1. `make`
> 1. copy the specific image tag (e.g. `docker.io/weaveworks/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
> 1. copy the specific image tag (e.g. `docker.io/fluxcd/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
> 1. deploy the resources in `/develop/*.yaml` manually with `kubectl apply`
> 1. make a change to the code
> 1. see your code changes have been deployed
Expand Down Expand Up @@ -98,19 +98,19 @@ Now that we know everything is working with `flux-getting-started`, we're going
In the same terminal you ran `eval $(minikube docker-env)`, run `GO111MODULE=on go mod download` followed by `make` from the root directory of the Flux repo. You'll see docker's usual output as it builds the image layers. Once it's done, you should see something like this in the middle of the output:
```
Successfully built 606610e0f4ef
Successfully tagged docker.io/weaveworks/flux:latest
Successfully tagged docker.io/weaveworks/flux:master-a86167e4
Successfully tagged docker.io/fluxcd/flux:latest
Successfully tagged docker.io/fluxcd/flux:master-a86167e4
```
This confirms that a new docker image was tagged for your image.
1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`. While we're here, also change the `git-url` to point towards your fork. It will look something like this in the yaml:
1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/fluxcd/flux`. While we're here, also change the `git-url` to point towards your fork. It will look something like this in the yaml:
```yaml
spec:
template:
spec:
containers:
- name: flux
image: docker.io/weaveworks/flux
image: docker.io/fluxcd/flux
imagePullPolicy: IfNotPresent
args:
- [email protected]:<YOUR-GITHUB-USERNAME>/flux-getting-started
Expand Down Expand Up @@ -157,8 +157,8 @@ Now that we know everything is working with `flux-getting-started`, we're going
You should see an output that looks something like this:
```
ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/weaveworks/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/weaveworks/flux successful=60 attempted=60
ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/fluxcd/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/fluxcd/flux successful=60 attempted=60
ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
Expand Down Expand Up @@ -186,9 +186,9 @@ Now that we know everything is working with `flux-getting-started`, we're going
flux-6f7fd5bbc-6j9d5 1/1 Running 0 10s
```
This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier. Freshpod saw that a new Docker image was tagged for `docker.io/weaveworks/flux:latest` and it went ahead and redeployed that pod for us.
This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier. Freshpod saw that a new Docker image was tagged for `docker.io/fluxcd/flux:latest` and it went ahead and redeployed that pod for us.
Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/weaveworks/flux` with no `:latest` tag, but it's the same difference) hasn't changed. The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/fluxcd/flux` with no `:latest` tag, but it's the same difference) hasn't changed. The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
There is another way to do this, of course. Remember that before when we ran `make` that we did _also_ get an image tagged with the `:<branch>-<commit hash>` syntax (in our specific example above it was `:master-a86167e4`). We could, in theory, grab that tag every time we `make`, and then paste it into `spec.template.spec.containers[0].image` of our deployment. That's tedious and error prone. Instead, `freshpod` cuts this step out for us and accomplishes the same end goal.
Expand Down
2 changes: 1 addition & 1 deletion site/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ happen:
```yaml
spec:
containers:
image: docker.io/weaveworks/flux
image: docker.io/fluxcd/flux
...
volumeMounts:
- name: acr-credentials
Expand Down

0 comments on commit d9c9b03

Please sign in to comment.